Fix .gitlab-ci.yml URL_SOURCE

.gitignore

@@ -1,16 +1,12 @@
-Black/x1/
-Black/x1_25/
-Black/x1_5/
-BlackTiny/x1/
-BlackTiny/x1_25/
-BlackTiny/x1_5/
-White/x1/
-White/x1_25/
-White/x1_5/
-WhiteTiny/x1/
-WhiteTiny/x1_25/
-WhiteTiny/x1_5/
-posy-black-tiny/
-posy-black/
-posy-white-tiny/
-posy-white/
+Main/Black/x1/
+Main/Black/x1_25/
+Main/Black/x1_5/
+Main/BlackTiny/x1/
+Main/BlackTiny/x1_25/
+Main/BlackTiny/x1_5/
+Main/White/x1/
+Main/White/x1_25/
+Main/White/x1_5/
+Main/WhiteTiny/x1/
+Main/WhiteTiny/x1_25/
+Main/WhiteTiny/x1_5/

.gitlab-ci.yml

@@ -0,0 +1,116 @@
+# 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:
+  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'"
+
+    # 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"'
+
+    # Update PKGBUILD parameters: version, source URL and SHA sum
+    - 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
+
+    # 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..."
+    - pacman -Syu --noconfirm sudo base-devel openssh git openssl
+
+    # Make AUR package
+    - mkdir -p /.cargo
+    - chmod -R 777 /.cargo
+    - cd posy-cursors/
+    - echo "Making main source package..."
+    - 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
+    - mkdir -p /root/.ssh
+    - cp ./aur.pub /root/.ssh/id_rsa.pub
+    - cat "$AUR_SSH_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}
+    - eval `ssh-agent -s`
+    - 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"
+
+    # Publish main package: clone AUR repo, commit update 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 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,6 +1,6 @@
 ## Preview
 
-![Preview](https://cloud.auteiy.me/apps/files_sharing/publicpreview/2NonrWGYwDD94TW?x=1920&y=624&a=true&file=PreviewCursors.png&scalingup=0)
+![Preview](https://cloud.auteiy.me/s/nqsGWPnKxT6KSEB/preview)
 
 
 ### Original
@@ -21,9 +21,45 @@ https://github.com/keeferrourke/capitaine-cursors
 
 ### Manual
 
+##### Build 
+
+You'll need:
+
+`imagemagick` for converting images to different sizes
+
+`xcursorgen` for creating **Xcursor** files 
+
+
+Run `bash Main/create.sh`
+
+`cd Prebuilt`
+
 Copy `posy-*` folders to `~/.icons`
 
+##### Download
+
+Download this [archive](https://git.auteiy.me/dmitry/cursorsPosy/-/archive/master/cursorsPosy-master.tar.gz?path=Prebuilt)
+
+Extract it
+
+`cd cursorsPosy-master-Prebuilt/Prebuilt`
+
+Copy `posy-*` folders to `~/.icons`
+
+
+
+
+
+
 ---
 
 #### After installation you can preview some of the cursors in action here
 https://codepen.io/chriscoyier/pen/uCwfB
+
+### Special Thanks
+
+##### To [Keefer Rourke](https://github.com/keeferrourke) for his [Capitaine Cursors](https://github.com/keeferrourke/capitaine-cursors) theme, from which I took scripts whole repository structure.
+
+##### To [Patrick Gordon](https://github.com/paddygord) for creating [ani2 ico converter](https://github.com/paddygord/cursor-converter/) from Windows's formats 
+
+##### To FisHlaBsoMAN for creating [localemouse](https://bitbucket.org/group-of-coders/localemouse/src/master/) software that check current cursor in use. 

pkg/aur/aur.pub

@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDHfiNi+rOCPKGLB6v9uuYR6GkN6Zd+CdaRbV82A26AUzs48ZG0xZGXHsoRuZY/yCUhcrS2u9xZ16fsAxnyf1QCF1hZVABUYtNhL1eEbSbLNiG9vIWJzbRjgegN/yyiG9ZVhFfNqXtPeapvuM3H44a2XeeFJcvTOfj/alkVjypi/DY/+XpC1IlX+CARC/e0zXHa3KZohn+CfBj8kWZWQEr7+EtKT59pslNxuJPcDUw7sKYLcBBz00BT0vv3lntyvZI1rRsD7AvItOwSZPp6or78Tgp8+O0HvFpjrlNipPEqDPpETIPcjTIVAlvlPFK1J0Rpzud38YdoWGfPiM77k7L7 timvisee@aur

pkg/aur/posy-cursors-git/PKGBUILD

@@ -0,0 +1,43 @@
+# 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

@@ -0,0 +1,21 @@
+# Maintainer: Auteiy <dmitry@auteiy.me>
+
+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"
+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
+
+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"
+}

src/Black/cursorList

@@ -2,24 +2,18 @@
 00008160000006810000408080010102 size_ver
 03b6e0fcb3499374a867c041f52298f0 circle
 08e8e1c95fe2fc01f976f1e063a24ccd progress
-3ecb610c1bf2410f44200f48c40d3599 progress
-5c6cd98b3f3ebcb1f9c7f1c204630408 help
-9d800788f1b08800ae810202380a0822 pointer
-640fb0e74195791501fd1ed57b41487f alias
 1081e37283d90000800003c07f3ef6bf copy
 3085a0e285430894940527032f8b26df alias
+3ecb610c1bf2410f44200f48c40d3599 progress
 4498f0e0c1937ffe01fd06f973665830 dnd-move
+5c6cd98b3f3ebcb1f9c7f1c204630408 help
 6407b0e94181790501fd1e167b474872 copy
+640fb0e74195791501fd1ed57b41487f alias
 9081237383d90e509aa00f00170e968f dnd-move
+9d800788f1b08800ae810202380a0822 pointer
 a2a266d0498c3104214a47bd64ab0fc8 alias
-b66166c04f8c3109214a4fbd64a50fc8 copy
-d9ce0ab605698f320427677b458ad60b help
-e29285e634086352946a0e7090d73106 pointer
-fcf21c00b30f7e3f83fe0dfd12e71cff dnd-move
-grabbing dnd-move
-nwse-resize size_fdiag
-nesw-resize size_bdiag
 arrow default
+b66166c04f8c3109214a4fbd64a50fc8 copy
 circle not-allowed
 closedhand dnd-move
 col-resize size_hor
@@ -27,13 +21,17 @@ color-picker crosshair
 copy dnd-move
 cross crosshair
 crossed_circle not-allowed
+d9ce0ab605698f320427677b458ad60b help
 dnd-copy copy
 dnd-none dnd-move
 e-resize size_hor
+e29285e634086352946a0e7090d73106 pointer
+fcf21c00b30f7e3f83fe0dfd12e71cff dnd-move
 forbidden no-drop
+grab openhand
+grabbing dnd-move
 h_double_arrow size_hor
 half-busy progress
-grab openhand
 hand1 pointer
 hand2 pointer
 ibeam text
@@ -42,8 +40,12 @@ left_ptr_help help
 left_ptr_watch progress
 left_side left-arrow
 link alias
+ll_angle bottom_left_corner
+lr_angle bottom_right_corner
 move dnd-move
 n-resize size_ver
+nesw-resize size_bdiag
+nwse-resize size_fdiag
 plus cell
 pointing_hand pointer
 question_arrow help
@@ -54,6 +56,9 @@ sb_v_double_arrow size_ver
 size_all fleur
 split_h col-resize
 split_v row-resize
+tcross crosshair
+ul_angle top_left_corner
+ur_angle top_right_corner
 v_double_arrow size_ver
 w-resize size_hor
 watch wait