.gitlab-ci.yml

@@ -1,54 +1,24 @@
 stages:
   - package
 
-package-aur:
+Update-AUR:
   image: archlinux/base
   stage: package
-  dependencies: []
   only:
     - /^v(\d+\.)*\d+$/
-  before_script: []
   script:
     - cd ./pkg/aur
 
-    - _version=$(echo $CI_COMMIT_REF_NAME | cut -c 2-)
-    - echo "Pushing'v$_version'"
+    - VERSION=$(echo $CI_COMMIT_REF_NAME | cut -c 2-)
 
-<<<<<<< HEAD
-    - sourceURL=https://git.auteiy.me/dmitry/cursorsPosy/-/archive/v$_version/cursorsPosy-v$_version.tar.gz?path=themes
-    - 'echo "Source: $sourceURL"'
-    - echo "Checking sha256sum checksums"
-    - 'sourceSHA=$(curl -sSL "$sourceURL" | sha256sum | cut -d" " -f1)'
-=======
-    # Determine remote URLs and SHA checksums
-    - echo "Determining SHA checksums for remote files..."
-    - URL_SOURCE=https://git.auteiy.me/dmitry/cursorsPosy/-/archive/v$VERSION/cursorsPosy-v$VERSION.tar.gz
-    - 'echo "Selected source URL: $URL_SOURCE"'
-    - echo "Determining sha256sum for remote source..."
-    - 'SHA_SOURCE=$(curl -sSL "$URL_SOURCE" | sha256sum | cut -d" " -f1)'
-    - 'echo "Got sha256sum: $SHA_SOURCE"'
->>>>>>> 1adbf2c... Fix source url
-
-    # Update PKGBUILD version, source URL and sha256sum
+    # Update pkgver in PKBUILD
     - echo "Updating PKGBUILDS with release information..."
-<<<<<<< HEAD
-    - sed "s/^pkgver=.*\$/pkgver=$_version/" -i posy-cursors/PKGBUILD
-    - sed "s/^source=(\"\(.*\)::.*\").*\$/source=(\"\1::$(echo $sourceURL | sed 's/\//\\\//g')\")/" -i posy-cursors/PKGBUILD
-    - sed "s/^sha256sums=.*\$/sha256sums=('$sourceSHA')/" -i posy-cursors/PKGBUILD
-=======
     - sed "s/^pkgver=.*\$/pkgver=$VERSION/" -i posy-cursors/PKGBUILD
-    - sed "s/^source=(\"\(.*\)::.*\").*\$/source=(\"\1::$(echo $URL_SOURCE | sed 's/\//\\\//g')\")/" -i posy-cursors/PKGBUILD
-    - sed "s/^sha256sums=.*\$/sha256sums=('$SHA_SOURCE')/" -i posy-cursors/PKGBUILD
-
-    # Get SHA hash for local and remote file w/o version, update if it has changed
-    # - 'SHA_STRIP_LOCAL=$(cat ffsend-git/PKGBUILD | sed /^pkgver=.\*/d | sha256sum | cut -d" " -f1)'
-    # - 'SHA_STRIP_REMOTE=$(curl -sSL "https://aur.archlinux.org/cgit/aur.git/plain/PKGBUILD?h=ffsend-git" | sed /^pkgver=.\*/d | sha256sum | cut -d" " -f1)'
->>>>>>> 1adbf2c... Fix source url
 
     - echo "Installing Arch"
     - pacman -Syu --noconfirm sudo base-devel openssh git openssl
 
-    # makepkg and .SRCINFO
+    # Build and update .SRCINFO
     - cd posy-cursors/
     - echo "makepkg"
     - sudo -u nobody makepkg -c
@@ -58,22 +28,22 @@ package-aur:
     # Configure SSH
     - mkdir -p /root/.ssh
     - cp ./aur.pub /root/.ssh/id_rsa.pub
-    - echo "$sshAUR" | base64 -d > /root/.ssh/id_rsa
+    - echo "${AUR_PRIVATE}" | base64 -d > /root/.ssh/id_rsa
     - echo "Host aur.archlinux.org" >> /root/.ssh/config
     - echo "  IdentityFile /root/.ssh/aur" >> /root/.ssh/config
     - echo "  User aur" >> /root/.ssh/config
-    - chmod 600 /root/.ssh/{id_rsa*,config}
+    - chmod 600 /root/.ssh/{id_rsa*,config} 
     - eval `ssh-agent -s`
-    - echo -en "${sshPASSPHRASE}" | ssh-add /root/.ssh/id_rsa
+    - echo -en "${SSH_PASSPHRASE}" | ssh-add /root/.ssh/id_rsa
     - ssh-keyscan -H aur.archlinux.org >> /root/.ssh/known_hosts
     - git config --global user.name "Dmitry Porunov"
-    - git config --global user.email "dmitry@auteiy.me"
+    - git config --global user.email "dmitry@ykkz.de"
 
     # Clone, commit and push
     - git clone ssh://aur@aur.archlinux.org/posy-cursors.git aur-posy-cursors
     - cd aur-posy-cursors
     - cp ../posy-cursors/{PKGBUILD,.SRCINFO} ./
     - git add PKGBUILD .SRCINFO
-    - git commit -m "Release v$_version"
+    - git commit -m "Release v$VERSION"
     - git push
     - cd ..

README.md

@@ -1,9 +1,3 @@
-## Preview
-
-![Preview](https://www.dropbox.com/s/mul36o4usbkdoxd/Preview.png?raw=1)
-
-
-### Original
 http://www.michieldb.nl/other/cursors/
 
 ##### Build script from here
@@ -38,11 +32,11 @@ Copy `posy-*` folders to `~/.icons`
 
 ##### Download
 
-Download this [archive](https://git.auteiy.me/dmitry/cursorsPosy/-/archive/master/cursorsPosy-master.tar.gz?path=themes)
+Download this [archive](https://gitlab.com/ykkzde/posy-cursors/-/archive/master/posy-cursors-master.tar.gz?path=themes)
 
 Extract it
 
-`cd cursorsPosy-master-themes/themes`
+`cd posy-cursors-master-themes/themes`
 
 Copy `posy-*` folders to `~/.icons`
 

pkg/aur/posy-cursors/PKGBUILD

@@ -1,21 +1,32 @@
-# Maintainer: Auteiy <dmitry@auteiy.me>
+# Maintainer: Ykkzde <dmitry@ykkz.de>
 
 pkgname=posy-cursors
 pkgver=0.0.0 # automatically set in CI, see: /.gitlab-ci.yml
 pkgrel=1
 pkgdesc="Port of Posy's improved cursors"
 arch=(any)
-url="https://git.auteiy.me/dmitry/cursorsPosy"
+url="https://gitlab.com/ykkzde/posy-cursors"
 license=(unknown)
-source=("$pkgname-$pkgver.tar.gz::$url/-/archive/v$pkgver/cursorsPosy-v$pkgver.tar.gz?path=themes") # automatically set in CI, see: /.gitlab-ci.yml
+source=("$pkgname-$pkgver-$pkgrel.tar.gz::$url/-/archive/v$pkgver/posy-cursors-v$pkgver.tar.gz?path=themes") # automatically set in CI, see: /.gitlab-ci.yml
 
 sha256sums=('SKIP') # automatically set in CI, see: /.gitlab-ci.yml
 
 package() {
-  cd cursorsPosy-v$pkgver-themes/themes
-  install -Ddm755 "$pkgdir/usr/share/icons"
-  cp -dr --no-preserve=ownership posy-white/ "$pkgdir/usr/share/icons/posy-white"
-  cp -dr --no-preserve=ownership posy-black/ "$pkgdir/usr/share/icons/posy-black"
-  cp -dr --no-preserve=ownership posy-white-tiny/ "$pkgdir/usr/share/icons/posy-white-tiny"
-  cp -dr --no-preserve=ownership posy-black-tiny/ "$pkgdir/usr/share/icons/posy-black-tiny"
+    echo "-------------------------------------------------------"
+    echo "-------------------------------------------------------"
+    echo "-------------------------------------------------------"
+    ls -l
+    echo "-------------------------------------------------------"
+    echo "-------------------------------------------------------"
+    echo "-------------------------------------------------------"
+    ls -l *
+    echo "-------------------------------------------------------"
+    echo "-------------------------------------------------------"
+    echo "-------------------------------------------------------"
+    cd $pkgname-$pkgver-$pkgrel/themes
+    install -Ddm755 "$pkgdir/usr/share/icons"
+    cp -dr --no-preserve=ownership posy-white/ "$pkgdir/usr/share/icons/posy-white"
+    cp -dr --no-preserve=ownership posy-black/ "$pkgdir/usr/share/icons/posy-black"
+    cp -dr --no-preserve=ownership posy-white-tiny/ "$pkgdir/usr/share/icons/posy-white-tiny"
+    cp -dr --no-preserve=ownership posy-black-tiny/ "$pkgdir/usr/share/icons/posy-black-tiny"
 }

src/Black/config/progress.cursor

@@ -1,304 +0,0 @@
-24 4 4 x1/progress-1.png 30
-24 4 4 x1/progress-2.png 30
-24 4 4 x1/progress-3.png 30
-24 4 4 x1/progress-4.png 30
-24 4 4 x1/progress-5.png 30
-24 4 4 x1/progress-6.png 30
-24 4 4 x1/progress-7.png 30
-24 4 4 x1/progress-8.png 30
-24 4 4 x1/progress-9.png 30
-24 4 4 x1/progress-10.png 30
-24 4 4 x1/progress-11.png 30
-24 4 4 x1/progress-12.png 30
-24 4 4 x1/progress-13.png 30
-24 4 4 x1/progress-14.png 30
-24 4 4 x1/progress-15.png 30
-24 4 4 x1/progress-16.png 30
-24 4 4 x1/progress-17.png 30
-24 4 4 x1/progress-18.png 30
-24 4 4 x1/progress-19.png 30
-24 4 4 x1/progress-20.png 30
-24 4 4 x1/progress-21.png 30
-24 4 4 x1/progress-22.png 30
-24 4 4 x1/progress-23.png 30
-24 4 4 x1/progress-24.png 30
-24 4 4 x1/progress-25.png 30
-24 4 4 x1/progress-26.png 30
-24 4 4 x1/progress-27.png 30
-24 4 4 x1/progress-28.png 30
-24 4 4 x1/progress-29.png 30
-24 4 4 x1/progress-30.png 30
-24 4 4 x1/progress-31.png 30
-24 4 4 x1/progress-32.png 30
-24 4 4 x1/progress-33.png 30
-24 4 4 x1/progress-34.png 30
-24 4 4 x1/progress-35.png 30
-24 4 4 x1/progress-36.png 30
-24 4 4 x1/progress-37.png 30
-24 4 4 x1/progress-38.png 30
-24 4 4 x1/progress-39.png 30
-24 4 4 x1/progress-40.png 30
-24 4 4 x1/progress-41.png 30
-24 4 4 x1/progress-42.png 30
-24 4 4 x1/progress-43.png 30
-24 4 4 x1/progress-44.png 30
-24 4 4 x1/progress-45.png 30
-24 4 4 x1/progress-46.png 30
-24 4 4 x1/progress-47.png 30
-24 4 4 x1/progress-48.png 30
-24 4 4 x1/progress-49.png 30
-24 4 4 x1/progress-50.png 30
-24 4 4 x1/progress-51.png 30
-24 4 4 x1/progress-52.png 30
-24 4 4 x1/progress-53.png 30
-24 4 4 x1/progress-54.png 30
-24 4 4 x1/progress-55.png 30
-24 4 4 x1/progress-56.png 30
-24 4 4 x1/progress-57.png 30
-24 4 4 x1/progress-58.png 30
-24 4 4 x1/progress-59.png 30
-24 4 4 x1/progress-60.png 30
-24 4 4 x1/progress-61.png 30
-24 4 4 x1/progress-62.png 30
-24 4 4 x1/progress-63.png 30
-24 4 4 x1/progress-64.png 30
-24 4 4 x1/progress-65.png 30
-24 4 4 x1/progress-66.png 30
-24 4 4 x1/progress-67.png 30
-24 4 4 x1/progress-68.png 30
-24 4 4 x1/progress-69.png 30
-24 4 4 x1/progress-70.png 30
-24 4 4 x1/progress-71.png 30
-24 4 4 x1/progress-72.png 30
-24 4 4 x1/progress-73.png 30
-24 4 4 x1/progress-74.png 30
-24 4 4 x1/progress-75.png 30
-24 4 4 x1/progress-76.png 30
-30 5 5 x1_25/progress-1.png 30
-30 5 5 x1_25/progress-2.png 30
-30 5 5 x1_25/progress-3.png 30
-30 5 5 x1_25/progress-4.png 30
-30 5 5 x1_25/progress-5.png 30
-30 5 5 x1_25/progress-6.png 30
-30 5 5 x1_25/progress-7.png 30
-30 5 5 x1_25/progress-8.png 30
-30 5 5 x1_25/progress-9.png 30
-30 5 5 x1_25/progress-10.png 30
-30 5 5 x1_25/progress-11.png 30
-30 5 5 x1_25/progress-12.png 30
-30 5 5 x1_25/progress-13.png 30
-30 5 5 x1_25/progress-14.png 30
-30 5 5 x1_25/progress-15.png 30
-30 5 5 x1_25/progress-16.png 30
-30 5 5 x1_25/progress-17.png 30
-30 5 5 x1_25/progress-18.png 30
-30 5 5 x1_25/progress-19.png 30
-30 5 5 x1_25/progress-20.png 30
-30 5 5 x1_25/progress-21.png 30
-30 5 5 x1_25/progress-22.png 30
-30 5 5 x1_25/progress-23.png 30
-30 5 5 x1_25/progress-24.png 30
-30 5 5 x1_25/progress-25.png 30
-30 5 5 x1_25/progress-26.png 30
-30 5 5 x1_25/progress-27.png 30
-30 5 5 x1_25/progress-28.png 30
-30 5 5 x1_25/progress-29.png 30
-30 5 5 x1_25/progress-30.png 30
-30 5 5 x1_25/progress-31.png 30
-30 5 5 x1_25/progress-32.png 30
-30 5 5 x1_25/progress-33.png 30
-30 5 5 x1_25/progress-34.png 30
-30 5 5 x1_25/progress-35.png 30
-30 5 5 x1_25/progress-36.png 30
-30 5 5 x1_25/progress-37.png 30
-30 5 5 x1_25/progress-38.png 30
-30 5 5 x1_25/progress-39.png 30
-30 5 5 x1_25/progress-40.png 30
-30 5 5 x1_25/progress-41.png 30
-30 5 5 x1_25/progress-42.png 30
-30 5 5 x1_25/progress-43.png 30
-30 5 5 x1_25/progress-44.png 30
-30 5 5 x1_25/progress-45.png 30
-30 5 5 x1_25/progress-46.png 30
-30 5 5 x1_25/progress-47.png 30
-30 5 5 x1_25/progress-48.png 30
-30 5 5 x1_25/progress-49.png 30
-30 5 5 x1_25/progress-50.png 30
-30 5 5 x1_25/progress-51.png 30
-30 5 5 x1_25/progress-52.png 30
-30 5 5 x1_25/progress-53.png 30
-30 5 5 x1_25/progress-54.png 30
-30 5 5 x1_25/progress-55.png 30
-30 5 5 x1_25/progress-56.png 30
-30 5 5 x1_25/progress-57.png 30
-30 5 5 x1_25/progress-58.png 30
-30 5 5 x1_25/progress-59.png 30
-30 5 5 x1_25/progress-60.png 30
-30 5 5 x1_25/progress-61.png 30
-30 5 5 x1_25/progress-62.png 30
-30 5 5 x1_25/progress-63.png 30
-30 5 5 x1_25/progress-64.png 30
-30 5 5 x1_25/progress-65.png 30
-30 5 5 x1_25/progress-66.png 30
-30 5 5 x1_25/progress-67.png 30
-30 5 5 x1_25/progress-68.png 30
-30 5 5 x1_25/progress-69.png 30
-30 5 5 x1_25/progress-70.png 30
-30 5 5 x1_25/progress-71.png 30
-30 5 5 x1_25/progress-72.png 30
-30 5 5 x1_25/progress-73.png 30
-30 5 5 x1_25/progress-74.png 30
-30 5 5 x1_25/progress-75.png 30
-30 5 5 x1_25/progress-76.png 30
-36 6 6 x1_5/progress-1.png 30
-36 6 6 x1_5/progress-2.png 30
-36 6 6 x1_5/progress-3.png 30
-36 6 6 x1_5/progress-4.png 30
-36 6 6 x1_5/progress-5.png 30
-36 6 6 x1_5/progress-6.png 30
-36 6 6 x1_5/progress-7.png 30
-36 6 6 x1_5/progress-8.png 30
-36 6 6 x1_5/progress-9.png 30
-36 6 6 x1_5/progress-10.png 30
-36 6 6 x1_5/progress-11.png 30
-36 6 6 x1_5/progress-12.png 30
-36 6 6 x1_5/progress-13.png 30
-36 6 6 x1_5/progress-14.png 30
-36 6 6 x1_5/progress-15.png 30
-36 6 6 x1_5/progress-16.png 30
-36 6 6 x1_5/progress-17.png 30
-36 6 6 x1_5/progress-18.png 30
-36 6 6 x1_5/progress-19.png 30
-36 6 6 x1_5/progress-20.png 30
-36 6 6 x1_5/progress-21.png 30
-36 6 6 x1_5/progress-22.png 30
-36 6 6 x1_5/progress-23.png 30
-36 6 6 x1_5/progress-24.png 30
-36 6 6 x1_5/progress-25.png 30
-36 6 6 x1_5/progress-26.png 30
-36 6 6 x1_5/progress-27.png 30
-36 6 6 x1_5/progress-28.png 30
-36 6 6 x1_5/progress-29.png 30
-36 6 6 x1_5/progress-30.png 30
-36 6 6 x1_5/progress-31.png 30
-36 6 6 x1_5/progress-32.png 30
-36 6 6 x1_5/progress-33.png 30
-36 6 6 x1_5/progress-34.png 30
-36 6 6 x1_5/progress-35.png 30
-36 6 6 x1_5/progress-36.png 30
-36 6 6 x1_5/progress-37.png 30
-36 6 6 x1_5/progress-38.png 30
-36 6 6 x1_5/progress-39.png 30
-36 6 6 x1_5/progress-40.png 30
-36 6 6 x1_5/progress-41.png 30
-36 6 6 x1_5/progress-42.png 30
-36 6 6 x1_5/progress-43.png 30
-36 6 6 x1_5/progress-44.png 30
-36 6 6 x1_5/progress-45.png 30
-36 6 6 x1_5/progress-46.png 30
-36 6 6 x1_5/progress-47.png 30
-36 6 6 x1_5/progress-48.png 30
-36 6 6 x1_5/progress-49.png 30
-36 6 6 x1_5/progress-50.png 30
-36 6 6 x1_5/progress-51.png 30
-36 6 6 x1_5/progress-52.png 30
-36 6 6 x1_5/progress-53.png 30
-36 6 6 x1_5/progress-54.png 30
-36 6 6 x1_5/progress-55.png 30
-36 6 6 x1_5/progress-56.png 30
-36 6 6 x1_5/progress-57.png 30
-36 6 6 x1_5/progress-58.png 30
-36 6 6 x1_5/progress-59.png 30
-36 6 6 x1_5/progress-60.png 30
-36 6 6 x1_5/progress-61.png 30
-36 6 6 x1_5/progress-62.png 30
-36 6 6 x1_5/progress-63.png 30
-36 6 6 x1_5/progress-64.png 30
-36 6 6 x1_5/progress-65.png 30
-36 6 6 x1_5/progress-66.png 30
-36 6 6 x1_5/progress-67.png 30
-36 6 6 x1_5/progress-68.png 30
-36 6 6 x1_5/progress-69.png 30
-36 6 6 x1_5/progress-70.png 30
-36 6 6 x1_5/progress-71.png 30
-36 6 6 x1_5/progress-72.png 30
-36 6 6 x1_5/progress-73.png 30
-36 6 6 x1_5/progress-74.png 30
-36 6 6 x1_5/progress-75.png 30
-36 6 6 x1_5/progress-76.png 30
-48 8 8 x2/progress-1.png 30
-48 8 8 x2/progress-2.png 30
-48 8 8 x2/progress-3.png 30
-48 8 8 x2/progress-4.png 30
-48 8 8 x2/progress-5.png 30
-48 8 8 x2/progress-6.png 30
-48 8 8 x2/progress-7.png 30
-48 8 8 x2/progress-8.png 30
-48 8 8 x2/progress-9.png 30
-48 8 8 x2/progress-10.png 30
-48 8 8 x2/progress-11.png 30
-48 8 8 x2/progress-12.png 30
-48 8 8 x2/progress-13.png 30
-48 8 8 x2/progress-14.png 30
-48 8 8 x2/progress-15.png 30
-48 8 8 x2/progress-16.png 30
-48 8 8 x2/progress-17.png 30
-48 8 8 x2/progress-18.png 30
-48 8 8 x2/progress-19.png 30
-48 8 8 x2/progress-20.png 30
-48 8 8 x2/progress-21.png 30
-48 8 8 x2/progress-22.png 30
-48 8 8 x2/progress-23.png 30
-48 8 8 x2/progress-24.png 30
-48 8 8 x2/progress-25.png 30
-48 8 8 x2/progress-26.png 30
-48 8 8 x2/progress-27.png 30
-48 8 8 x2/progress-28.png 30
-48 8 8 x2/progress-29.png 30
-48 8 8 x2/progress-30.png 30
-48 8 8 x2/progress-31.png 30
-48 8 8 x2/progress-32.png 30
-48 8 8 x2/progress-33.png 30
-48 8 8 x2/progress-34.png 30
-48 8 8 x2/progress-35.png 30
-48 8 8 x2/progress-36.png 30
-48 8 8 x2/progress-37.png 30
-48 8 8 x2/progress-38.png 30
-48 8 8 x2/progress-39.png 30
-48 8 8 x2/progress-40.png 30
-48 8 8 x2/progress-41.png 30
-48 8 8 x2/progress-42.png 30
-48 8 8 x2/progress-43.png 30
-48 8 8 x2/progress-44.png 30
-48 8 8 x2/progress-45.png 30
-48 8 8 x2/progress-46.png 30
-48 8 8 x2/progress-47.png 30
-48 8 8 x2/progress-48.png 30
-48 8 8 x2/progress-49.png 30
-48 8 8 x2/progress-50.png 30
-48 8 8 x2/progress-51.png 30
-48 8 8 x2/progress-52.png 30
-48 8 8 x2/progress-53.png 30
-48 8 8 x2/progress-54.png 30
-48 8 8 x2/progress-55.png 30
-48 8 8 x2/progress-56.png 30
-48 8 8 x2/progress-57.png 30
-48 8 8 x2/progress-58.png 30
-48 8 8 x2/progress-59.png 30
-48 8 8 x2/progress-60.png 30
-48 8 8 x2/progress-61.png 30
-48 8 8 x2/progress-62.png 30
-48 8 8 x2/progress-63.png 30
-48 8 8 x2/progress-64.png 30
-48 8 8 x2/progress-65.png 30
-48 8 8 x2/progress-66.png 30
-48 8 8 x2/progress-67.png 30
-48 8 8 x2/progress-68.png 30
-48 8 8 x2/progress-69.png 30
-48 8 8 x2/progress-70.png 30
-48 8 8 x2/progress-71.png 30
-48 8 8 x2/progress-72.png 30
-48 8 8 x2/progress-73.png 30
-48 8 8 x2/progress-74.png 30
-48 8 8 x2/progress-75.png 30
-48 8 8 x2/progress-76.png 30