Fix path in PKGBUILD, remove unneeded lines in .gitlab-ci.yml

Debugging

Debugging

Another try

.gitlab-ci.yml

@@ -1,118 +1,57 @@
-# GitLab CI configuration for ffsend builds, tests and releases
-#
-# To add a new release:
-# - configure a new 'build-*' job with the proper target
-# - export a build artifact from the new job
-# - manually upload artifact to GitHub in the 'github-release' job
-
 stages:
   - package
 
-# AUR packages release
-package-aur:
+Update-AUR:
   image: archlinux/base
   stage: package
-  # needs:
-  #   - release-github
-  dependencies: []
   only:
     - /^v(\d+\.)*\d+$/
-  before_script: []
   script:
     - cd ./pkg/aur
 
-    # Determine the version number we're releasing for
-    - VERSION=$(echo $CI_COMMIT_REF_NAME | cut -c 2-)
-    - echo "Determined binary version number 'v$VERSION'"
+    - _version=$(echo $CI_COMMIT_REF_NAME | cut -c 2-)
+    - echo "Pushing'v$_version'"
 
-    # 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?path=themes
-    - '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"'
+    - sourceURL=https://gitlab.com/ykkzde/posy-cursors/-/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)'
 
-    # Update PKGBUILD parameters: version, source URL and SHA sum
+    # Update PKGBUILD version, source URL and sha256sum
     - echo "Updating PKGBUILDS with release information..."
-    - 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
+    - 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
 
-    # 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)'
-
-    # Install dependencies
-    - echo "Installing required build packages..."
+    - echo "Installing Arch"
     - pacman -Syu --noconfirm sudo base-devel openssh git openssl
 
-    # Make AUR package
-    - mkdir -p /.cargo
-    - chmod -R 777 /.cargo
+    # Makepkg and .SRCINFO
     - cd posy-cursors/
-    - echo "Making main source package..."
+    - echo "makepkg"
     - sudo -u nobody makepkg -c
     - sudo -u nobody makepkg --printsrcinfo > .SRCINFO
-    # Make git package if different than the remote
-    # - |
-    #   if [ ! "$SHA_STRIP_LOCAL" == "$SHA_STRIP_REMOTE" ]; then
-    #     cd ../ffsend-git
-    #     echo "Making git source package..."
-    #     sudo -u nobody makepkg -c
-    #     sudo -u nobody makepkg --printsrcinfo > .SRCINFO
-    #   else
-    #     echo "Not making git source package, it has not changed"
-    #   fi
     - cd ..
 
-    # Set up SSH for publishing
+    # Configure SSH
     - mkdir -p /root/.ssh
-    - echo "$AUR_SSH_PRIVATE"
-    - sleep 5
     - cp ./aur.pub /root/.ssh/id_rsa.pub
-    - echo "$AUR_SSH_PRIVATE" | 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`
-    - 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"
 
-    # Publish main package: clone AUR repo, commit update and push
+    # 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 ..
-
-    # Publish binary package: clone AUR repo, commit update and push
-    # - git clone ssh://aur@aur.archlinux.org/ffsend-bin.git aur-ffsend-bin
-    # - cd aur-ffsend-bin
-    # - cp ../ffsend-bin/{PKGBUILD,.SRCINFO} ./
-    # - git add PKGBUILD .SRCINFO
-    # - git commit -m "Release v$VERSION"
-    # - git push
-    # - cd ..
-
-    # Publish git package: clone AUR repo, commit update and push
-    # Only publish it if it is different than the remote
-    # - |
-    #   if [ ! "$SHA_STRIP_LOCAL" == "$SHA_STRIP_REMOTE" ]; then
-    #     git clone ssh://aur@aur.archlinux.org/ffsend-git.git aur-ffsend-git
-    #     cd aur-ffsend-git
-    #     cp ../ffsend-git/{PKGBUILD,.SRCINFO} ./
-    #     git add PKGBUILD .SRCINFO
-    #     git commit -m "Update PKGBUILD for release v$VERSION"
-    #     git push
-    #     cd ..
-    #   else
-    #     echo "Not pushing git package, it has not changed"
-    #   fi
-
-# TODO: add job to test ffsend{-git} AUR packages

README.md

@@ -1,9 +1,3 @@
-## Preview
-
-![Preview](https://cloud.auteiy.me/s/nqsGWPnKxT6KSEB/preview)
-
-
-### Original
 http://www.michieldb.nl/other/cursors/
 
 ##### Build script from here
@@ -30,19 +24,19 @@ You'll need:
 `xcursorgen` for creating **Xcursor** files 
 
 
-Run `bash Main/create.sh`
+Run `bash src/create.sh`
 
-`cd Prebuilt`
+`cd themes`
 
 Copy `posy-*` folders to `~/.icons`
 
 ##### Download
 
-Download this [archive](https://git.auteiy.me/dmitry/cursorsPosy/-/archive/master/cursorsPosy-master.tar.gz?path=Prebuilt)
+Download this [archive](https://gitlab.com/ykkzde/posy-cursors/-/archive/master/posy-cursors-master.tar.gz?path=themes)
 
 Extract it
 
-`cd cursorsPosy-master-Prebuilt/Prebuilt`
+`cd posy-cursors-master-themes/themes`
 
 Copy `posy-*` folders to `~/.icons`
 

pkg/aur/posy-cursors-git/PKGBUILD

@@ -1,43 +0,0 @@
-# Maintainer: Tim Visee <tim@visee.me>
-#
-# This PKGBUILD is managed externally, and is automatically updated here:
-# - https://gitlab.com/timvisee/ffsend/blob/master/pkg/aur/ffsend-git/PKGBUILD
-# - Mirror: https://github.com/timvisee/ffsend/blob/master/pkg/aur/ffsend-git/PKGBUILD
-
-pkgname=ffsend-git
-pkgver=0.0.0 # automatically set in CI, see: /.gitlab-ci.yml
-pkgrel=1
-pkgdesc="Easily and securely share files from the command line. A Firefox Send client."
-url="https://gitlab.com/timvisee/ffsend"
-license=('GPL3')
-source=("ffsend::git+$url.git")
-sha256sums=('SKIP')
-arch=('x86_64' 'i686')
-provides=('ffsend')
-conflicts=('ffsend')
-depends=('ca-certificates')
-makedepends=('openssl>=1.0' 'rust>=1.32' 'cargo' 'cmake')
-optdepends=('xclip: clipboard support'
-            'bash-completion: support auto completion for bash')
-
-build() {
-    cd ffsend
-    env CARGO_INCREMENTAL=0 cargo build --release
-}
-
-package() {
-    cd "$srcdir/ffsend"
-
-    # Install Binary
-    install -Dm755 "./target/release/ffsend" "$pkgdir/usr/bin/ffsend"
-
-    # Install shell completions and LICENSE file
-    install -Dm644 "contrib/completions/ffsend.bash" \
-        "$pkgdir/etc/bash_completion.d/ffsend"
-	install -Dm644 "contrib/completions/_ffsend" \
-        "$pkgdir/usr/share/zsh/site-functions/_ffsend"
-	install -Dm644 "contrib/completions/ffsend.fish" \
-        "$pkgdir/usr/share/fish/vendor_completions.d/ffsend.fish"
-    install -Dm644 "LICENSE" \
-        "$pkgdir/usr/share/licenses/ffsend/LICENSE"
-}

pkg/aur/posy-cursors/PKGBUILD

@@ -1,18 +1,18 @@
-# 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.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
+  cd posy-cursors-v$pkgver/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"