diff --git a/PKGBUILDS/swayosd-git/PKGBUILD b/PKGBUILDS/swayosd-git/PKGBUILD index 6cab1ea..80215bb 100644 --- a/PKGBUILDS/swayosd-git/PKGBUILD +++ b/PKGBUILDS/swayosd-git/PKGBUILD @@ -4,7 +4,7 @@ pkgname=swayosd-git _pkgname="${pkgname%-git}" _reponame=SwayOSD -pkgver=r57.1127176 +pkgver=0.1.0.r0.gdbb8b72 pkgrel=1 pkgdesc="A GTK based on screen display for keyboard shortcuts like caps-lock and volume" arch=('x86_64' 'aarch64' 'i686') @@ -19,7 +19,12 @@ sha256sums=('SKIP') pkgver() { cd "${_reponame}" - printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" + + if GITTAG="$(git describe --abbrev=0 --tags 2>/dev/null)"; then + echo "$(sed -e "s/^${pkgname%%-git}//" -e 's/^[-_/a-zA-Z]\+//' -e 's/[-_+]/./g' <<< ${GITTAG}).r$(git rev-list --count ${GITTAG}..).g$(git log -1 --format="%h")" + else + printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" + fi } prepare() { @@ -36,4 +41,4 @@ build() { package() { cd "${_reponame}" meson install -C build --destdir "$pkgdir" -} +} \ No newline at end of file diff --git a/build.sh b/build.sh index dd2c34a..e868e33 100644 --- a/build.sh +++ b/build.sh @@ -1,5 +1,5 @@ #!/bin/bash - +# set -e # exit on error # Function to handle errors handle_error() { echo "Error on line $1" @@ -114,12 +114,12 @@ build_and_package() { "pamac-all" "pandoc-bin" "python-clickgen" - "pyprland" + # "pyprland" # #"repoctl" # "rua" "swayfx" "sway-nvidia" - # #"swayosd-git" + "swayosd-git" "ventoy-bin" "yay-bin" ) diff --git a/initialize.sh b/initialize.sh deleted file mode 100755 index 2535409..0000000 --- a/initialize.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -repo-add -R x86_64/stratos.db.tar.gz x86_64/*.pkg.tar.zst -# Check cassava/repoctl README for tips -# rm -rf x86_64/StratOS-repo** -# repoctl conf new x86_64/StratOS-repo.db.tar.zst -# repoctl reset diff --git a/x86_64/stratos.db b/x86_64/stratos.db deleted file mode 120000 index 4417ee6..0000000 --- a/x86_64/stratos.db +++ /dev/null @@ -1 +0,0 @@ -stratos.db.tar.gz \ No newline at end of file diff --git a/x86_64/stratos.db.tar.gz b/x86_64/stratos.db.tar.gz deleted file mode 100644 index beb9e7b..0000000 Binary files a/x86_64/stratos.db.tar.gz and /dev/null differ diff --git a/x86_64/stratos.files b/x86_64/stratos.files deleted file mode 120000 index bd1afe9..0000000 --- a/x86_64/stratos.files +++ /dev/null @@ -1 +0,0 @@ -stratos.files.tar.gz \ No newline at end of file diff --git a/x86_64/stratos.files.tar.gz b/x86_64/stratos.files.tar.gz deleted file mode 100644 index 076872e..0000000 Binary files a/x86_64/stratos.files.tar.gz and /dev/null differ