From 7c35b93f3d9888593370eb68c9905cb9920066c9 Mon Sep 17 00:00:00 2001 From: Gwenhael Le Moine Date: Tue, 15 Jun 2021 15:15:18 +0200 Subject: [PATCH] convert all git-pulling scripts to allow building specific tag --- a/broadcom-bt-firmware/SlackBuild | 4 ++-- a/pine64-platform-scripts/SlackBuild | 4 ++-- a/rpi-firmware-nonfree/SlackBuild | 4 ++-- ap/bandwhich/SlackBuild | 4 ++-- ap/bat/SlackBuild | 4 ++-- ap/bemenu/SlackBuild | 4 ++-- ap/broot/SlackBuild | 4 ++-- ap/btm/SlackBuild | 4 ++-- ap/checkssl/SlackBuild | 4 ++-- ap/delta/SlackBuild | 4 ++-- ap/diskus/SlackBuild | 4 ++-- ap/dive/SlackBuild | 3 ++- ap/dust/SlackBuild | 4 ++-- ap/esptool/SlackBuild | 5 ++--- ap/exa/SlackBuild | 4 ++-- ap/f3/SlackBuild | 4 ++-- ap/fd/SlackBuild | 4 ++-- ap/getssl/SlackBuild | 4 ++-- ap/grex/SlackBuild | 4 ++-- ap/ht/SlackBuild | 4 ++-- ap/httpie/SlackBuild | 4 ++-- ap/hyperfine/SlackBuild | 4 ++-- ap/icr/SlackBuild | 5 +++-- ap/ion/SlackBuild | 4 ++-- ap/ledger/SlackBuild | 2 +- ap/lsd/SlackBuild | 4 ++-- ap/lsyncd/SlackBuild | 5 ++--- ap/motion/SlackBuild | 4 ++-- ap/nu/SlackBuild | 4 ++-- ap/procs/SlackBuild | 4 ++-- ap/ripgrep/SlackBuild | 4 ++-- ap/rustup/SlackBuild | 3 ++- ap/sd/SlackBuild | 4 ++-- ap/starship/SlackBuild | 4 ++-- ap/stow/SlackBuild | 4 ++-- ap/tldr/SlackBuild | 4 ++-- ap/wp-cli/SlackBuild | 2 +- ap/ycmd/SlackBuild | 3 ++- ap/ytop/SlackBuild | 4 ++-- d/ameba/SlackBuild | 9 ++++----- d/chruby/SlackBuild | 10 +++++----- d/dtc/SlackBuild | 4 ++-- d/rbspy/SlackBuild | 4 ++-- d/rpn/SlackBuild | 5 ++--- d/ruby-install/SlackBuild | 10 +++++----- d/scry/SlackBuild | 5 ++--- d/wabt/SlackBuild | 5 ++--- e/emacs/SlackBuild | 4 +++- l/apcu/SlackBuild | 4 ++-- l/fmt/SlackBuild | 5 ++--- l/raylib/SlackBuild | 8 +++++--- l/spdlog/SlackBuild | 6 +++--- lua/lgi/SlackBuild | 2 +- lua/luarocks/SlackBuild | 5 +++-- n/calibre-web/SlackBuild | 4 +++- n/pluxml/SlackBuild | 8 +++++--- wayland/dmenu-wayland/SlackBuild | 7 ++++--- wayland/dwl/SlackBuild | 6 +++--- wayland/foot/SlackBuild | 7 ++++--- wayland/kanshi/SlackBuild | 7 ++++--- wayland/mako/SlackBuild | 7 ++++--- wayland/seatd/SlackBuild | 7 ++++--- wayland/sway/SlackBuild | 7 ++++--- wayland/swaybg/SlackBuild | 7 ++++--- wayland/swayidle/SlackBuild | 7 ++++--- wayland/swaylock/SlackBuild | 7 ++++--- wayland/waybar/SlackBuild | 7 ++++--- wayland/wlsunset/SlackBuild | 6 ++++-- xap/alacritty/SlackBuild | 4 ++-- xap/alttab/SlackBuild | 4 +++- xap/brightnessctl/SlackBuild | 10 ++++------ xap/i3status-rust/SlackBuild | 4 ++-- xap/image-roll/SlackBuild | 4 ++-- xap/kitty/SlackBuild | 6 ++++-- xap/leocad/SlackBuild | 3 ++- xap/nextcloud-client/SlackBuild | 22 ++++++++-------------- xap/polybar/SlackBuild | 6 ++++-- xap/radeon-profile/SlackBuild | 3 ++- xap/rkvm/SlackBuild | 4 ++-- xap/wezterm/SlackBuild | 5 +++-- xap/x48/SlackBuild | 6 ++++-- xap/x49gp/SlackBuild | 7 ++++--- y/cboard/SlackBuild | 5 ++++- y/steamtinkerlaunch/SlackBuild | 3 ++- 84 files changed, 227 insertions(+), 201 deletions(-) diff --git a/a/broadcom-bt-firmware/SlackBuild b/a/broadcom-bt-firmware/SlackBuild index d3486dad..c7125205 100755 --- a/a/broadcom-bt-firmware/SlackBuild +++ b/a/broadcom-bt-firmware/SlackBuild @@ -2,7 +2,7 @@ # variables CWD=$(pwd) - +VERSION=${VERSION:-"trunk"} BUILD=${BUILD:-1} TAG=gwh @@ -24,7 +24,7 @@ rm -fr $PKG # mise en place [ ! -e $REPOSITORY ] && git clone https://github.com/winterheart/broadcom-bt-firmware.git $REPOSITORY ( cd $REPOSITORY; git pull ) -VERSION="git_$( cd $REPOSITORY && git log -1 --format=%h_%ad --date=format:%Y.%m.%d )" +[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git log -1 --format=%h_%ad --date=format:%Y.%m.%d)" || git checkout $VERSION mkdir -p $PKG/lib/firmware/ cp -R $REPOSITORY/brcm/ $PKG/lib/firmware/ diff --git a/a/pine64-platform-scripts/SlackBuild b/a/pine64-platform-scripts/SlackBuild index 31894375..0e94c6d8 100755 --- a/a/pine64-platform-scripts/SlackBuild +++ b/a/pine64-platform-scripts/SlackBuild @@ -3,7 +3,7 @@ # variables CWD=$(pwd) -VERSION=${VERSION:-$(date +"%Y.%m.%d_%H.%M")} +VERSION=${VERSION:-"trunk"} BUILD=${BUILD:-1} TAG=gwh @@ -25,7 +25,7 @@ rm -fr $PKG # mise en place [ ! -e $REPOSITORY ] && git clone https://github.com/longsleep/build-pine64-image.git $REPOSITORY ( cd $REPOSITORY; git pull ) -VERSION="git_$( cd $REPOSITORY && git log -1 --format=%h_%ad --date=format:%Y.%m.%d )" +[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git log -1 --format=%h_%ad --date=format:%Y.%m.%d)" || git checkout $VERSION mkdir -p $PKG/usr/bin cp $REPOSITORY/simpleimage/platform-scripts/* $PKG/usr/bin/ diff --git a/a/rpi-firmware-nonfree/SlackBuild b/a/rpi-firmware-nonfree/SlackBuild index 52499525..9f538b13 100755 --- a/a/rpi-firmware-nonfree/SlackBuild +++ b/a/rpi-firmware-nonfree/SlackBuild @@ -3,7 +3,7 @@ # variables CWD=$(pwd) -VERSION=${VERSION:-$(date +"%Y.%m.%d_%H.%M")} +VERSION=${VERSION:-"trunk"} BUILD=${BUILD:-1} TAG=gwh @@ -25,7 +25,7 @@ rm -fr $PKG # mise en place [ ! -e $REPOSITORY ] && git clone https://github.com/RPi-Distro/firmware-nonfree.git $REPOSITORY ( cd $REPOSITORY; git pull ) -VERSION="git_$( cd $REPOSITORY && git log -1 --format=%h_%ad --date=format:%Y.%m.%d )" +[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git log -1 --format=%h_%ad --date=format:%Y.%m.%d)" || git checkout $VERSION mkdir -p $PKG/lib/firmware diff --git a/ap/bandwhich/SlackBuild b/ap/bandwhich/SlackBuild index 3d417e03..4198d195 100755 --- a/ap/bandwhich/SlackBuild +++ b/ap/bandwhich/SlackBuild @@ -1,7 +1,7 @@ #!/bin/bash # variables -VERSION=${VERSION:-$(date +"%Y.%m.%d_%H.%M")} +VERSION=${VERSION:-"trunk"} BUILD=${BUILD:-1} TAG=gwh @@ -27,10 +27,10 @@ cd $TMP [ ! -e $REPOSITORY ] && git clone https://github.com/imsnif/bandwhich.git $REPOSITORY cd $REPOSITORY git pull --all -VERSION="git_$( cd $REPOSITORY && git log -1 --format=%h_%ad --date=format:%Y.%m.%d )" cp -R $REPOSITORY $TMP/ cd $TMP/$PRGNAM +[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git log -1 --format=%h_%ad --date=format:%Y.%m.%d)" || git checkout $VERSION cargo build --release diff --git a/ap/bat/SlackBuild b/ap/bat/SlackBuild index 667de5fb..f2a5543e 100755 --- a/ap/bat/SlackBuild +++ b/ap/bat/SlackBuild @@ -1,7 +1,7 @@ #!/bin/bash # variables -VERSION=${VERSION:-$(date +"%Y.%m.%d_%H.%M")} +VERSION=${VERSION:-"trunk"} BUILD=${BUILD:-1} TAG=gwh @@ -27,10 +27,10 @@ cd $TMP [ ! -e $REPOSITORY ] && git clone https://github.com/sharkdp/bat.git $REPOSITORY cd $REPOSITORY git pull --all -VERSION="git_$( cd $REPOSITORY && git log -1 --format=%h_%ad --date=format:%Y.%m.%d )" cp -R $REPOSITORY $TMP/ cd $TMP/$PRGNAM +[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git log -1 --format=%h_%ad --date=format:%Y.%m.%d)" || git checkout $VERSION cargo build --release diff --git a/ap/bemenu/SlackBuild b/ap/bemenu/SlackBuild index a5567cfe..2692efb7 100755 --- a/ap/bemenu/SlackBuild +++ b/ap/bemenu/SlackBuild @@ -3,7 +3,7 @@ set -e # variables -VERSION=${VERSION:-"git"} +VERSION=${VERSION:-"trunk"} BUILD=${BUILD:-1} TAG=gwh @@ -28,11 +28,11 @@ mkdir -p $PKG [ ! -e $REPOSITORY ] && git clone https://github.com/Cloudef/bemenu.git $REPOSITORY cd $REPOSITORY git pull --all -VERSION="git_$( cd $REPOSITORY && git log -1 --format=%h_%ad --date=format:%Y.%m.%d )" mkdir -p $TMP/ cp -a $REPOSITORY $TMP/ cd $TMP/$PRGNAM +[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git log -1 --format=%h_%ad --date=format:%Y.%m.%d)" || git checkout $VERSION sed -i 's|-O2| -O2 -fPIC|' GNUmakefile make clients x11 wayland curses diff --git a/ap/broot/SlackBuild b/ap/broot/SlackBuild index 9e61e07b..dbf71d16 100755 --- a/ap/broot/SlackBuild +++ b/ap/broot/SlackBuild @@ -1,7 +1,7 @@ #!/bin/bash # variables -VERSION=${VERSION:-$(date +"%Y.%m.%d_%H.%M")} +VERSION=${VERSION:-"trunk"} BUILD=${BUILD:-1} TAG=gwh @@ -27,10 +27,10 @@ cd $TMP [ ! -e $REPOSITORY ] && git clone https://github.com/Canop/broot.git $REPOSITORY cd $REPOSITORY git pull --all -VERSION="git_$( cd $REPOSITORY && git log -1 --format=%h_%ad --date=format:%Y.%m.%d )" cp -R $REPOSITORY $TMP/ cd $TMP/$PRGNAM +[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git log -1 --format=%h_%ad --date=format:%Y.%m.%d)" || git checkout $VERSION cargo build --release diff --git a/ap/btm/SlackBuild b/ap/btm/SlackBuild index 5e582ae5..c15a4b63 100755 --- a/ap/btm/SlackBuild +++ b/ap/btm/SlackBuild @@ -1,7 +1,7 @@ #!/bin/bash # variables -VERSION=${VERSION:-$(date +"%Y.%m.%d_%H.%M")} +VERSION=${VERSION:-"trunk"} BUILD=${BUILD:-1} TAG=gwh @@ -27,10 +27,10 @@ cd $TMP [ ! -e $REPOSITORY ] && git clone https://github.com/clementtsang/bottom.git $REPOSITORY cd $REPOSITORY git pull --all -VERSION="git_$( cd $REPOSITORY && git log -1 --format=%h_%ad --date=format:%Y.%m.%d )" cp -R $REPOSITORY $TMP/ cd $TMP/$PRGNAM +[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git log -1 --format=%h_%ad --date=format:%Y.%m.%d)" || git checkout $VERSION cargo build --release diff --git a/ap/checkssl/SlackBuild b/ap/checkssl/SlackBuild index 8fe293d0..7d0c3bb4 100755 --- a/ap/checkssl/SlackBuild +++ b/ap/checkssl/SlackBuild @@ -1,7 +1,7 @@ #!/bin/bash # variables -#VERSION=${VERSION:-$(date +"%Y.%m.%d_%H.%M")} +VERSION=${VERSION:-"trunk"} BUILD=${BUILD:-1} TAG=gwh @@ -26,7 +26,7 @@ mkdir -p $PKG [ ! -e $REPOSITORY ] && git clone https://github.com/srvrco/checkssl.git $REPOSITORY cd $REPOSITORY git pull --all -VERSION="git_$( cd $REPOSITORY && git log -1 --format=%h_%ad --date=format:%Y.%m.%d )" +[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git log -1 --format=%h_%ad --date=format:%Y.%m.%d)" || git checkout $VERSION mkdir -p $PKG$PREFIX/bin cp $REPOSITORY/checkssl $PKG$PREFIX/bin/ diff --git a/ap/delta/SlackBuild b/ap/delta/SlackBuild index d0d675cf..9e6e330d 100755 --- a/ap/delta/SlackBuild +++ b/ap/delta/SlackBuild @@ -1,7 +1,7 @@ #!/bin/bash # variables -VERSION=${VERSION:-$(date +"%Y.%m.%d_%H.%M")} +VERSION=${VERSION:-"trunk"} BUILD=${BUILD:-1} TAG=gwh @@ -27,10 +27,10 @@ cd $TMP [ ! -e $REPOSITORY ] && git clone https://github.com/dandavison/delta.git $REPOSITORY cd $REPOSITORY git pull --all -VERSION="git_$( cd $REPOSITORY && git log -1 --format=%h_%ad --date=format:%Y.%m.%d )" cp -R $REPOSITORY $TMP/ cd $TMP/$PRGNAM +[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git log -1 --format=%h_%ad --date=format:%Y.%m.%d)" || git checkout $VERSION cargo build --release diff --git a/ap/diskus/SlackBuild b/ap/diskus/SlackBuild index 4770ac8f..60db0e67 100755 --- a/ap/diskus/SlackBuild +++ b/ap/diskus/SlackBuild @@ -1,7 +1,7 @@ #!/bin/bash # variables -VERSION=${VERSION:-$(date +"%Y.%m.%d_%H.%M")} +VERSION=${VERSION:-"trunk"} BUILD=${BUILD:-1} TAG=gwh @@ -27,10 +27,10 @@ cd $TMP [ ! -e $REPOSITORY ] && git clone https://github.com/sharkdp/diskus.git $REPOSITORY cd $REPOSITORY git pull --all -VERSION="git_$( cd $REPOSITORY && git log -1 --format=%h_%ad --date=format:%Y.%m.%d )" cp -R $REPOSITORY $TMP/ cd $TMP/$PRGNAM +[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git log -1 --format=%h_%ad --date=format:%Y.%m.%d)" || git checkout $VERSION cargo build --release diff --git a/ap/dive/SlackBuild b/ap/dive/SlackBuild index 341c6078..562f465f 100755 --- a/ap/dive/SlackBuild +++ b/ap/dive/SlackBuild @@ -1,6 +1,7 @@ #!/bin/bash # variables +VERSION=${VERSION:-"trunk"} BUILD=${BUILD:-1} TAG=gwh @@ -26,10 +27,10 @@ cd $TMP [ ! -e $REPOSITORY ] && git clone https://github.com/wagoodman/dive.git $REPOSITORY cd $REPOSITORY git pull --all -VERSION="git_$( cd $REPOSITORY && git log -1 --format=%h_%ad --date=format:%Y.%m.%d )" cp -R $REPOSITORY $TMP/ cd $TMP/$PRGNAM +[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git log -1 --format=%h_%ad --date=format:%Y.%m.%d)" || git checkout $VERSION make diff --git a/ap/dust/SlackBuild b/ap/dust/SlackBuild index cef60e5d..4865a597 100755 --- a/ap/dust/SlackBuild +++ b/ap/dust/SlackBuild @@ -1,7 +1,7 @@ #!/bin/bash # variables -VERSION=${VERSION:-$(date +"%Y.%m.%d_%H.%M")} +VERSION=${VERSION:-"trunk"} BUILD=${BUILD:-1} TAG=gwh @@ -27,10 +27,10 @@ cd $TMP [ ! -e $REPOSITORY ] && git clone https://github.com/bootandy/dust.git $REPOSITORY cd $REPOSITORY git pull --all -VERSION="git_$( cd $REPOSITORY && git log -1 --format=%h_%ad --date=format:%Y.%m.%d )" cp -R $REPOSITORY $TMP/ cd $TMP/$PRGNAM +[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git log -1 --format=%h_%ad --date=format:%Y.%m.%d)" || git checkout $VERSION cargo build --release diff --git a/ap/esptool/SlackBuild b/ap/esptool/SlackBuild index ebbeaf75..5d281905 100755 --- a/ap/esptool/SlackBuild +++ b/ap/esptool/SlackBuild @@ -2,7 +2,7 @@ CWD=$(pwd) PRGNAM=$(basename $CWD) -VERSION=$(date +%F | tr - .) +VERSION=${VERSION:-"trunk"} BUILD=1 ARCH=noarch @@ -22,11 +22,10 @@ mkdir -p $TMP [ ! -e $REPOSITORY ] && git clone https://github.com/espressif/esptool.git $REPOSITORY cd $REPOSITORY git pull --all -VERSION="git_$( cd $REPOSITORY && git log -1 --format=%h_%ad --date=format:%Y.%m.%d )" cp -R $REPOSITORY $TMP/$PRGNAM - cd $TMP/$PRGNAM +[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git log -1 --format=%h_%ad --date=format:%Y.%m.%d)" || git checkout $VERSION python setup.py install --root $PKG diff --git a/ap/exa/SlackBuild b/ap/exa/SlackBuild index be6b4893..ba5fcc00 100755 --- a/ap/exa/SlackBuild +++ b/ap/exa/SlackBuild @@ -1,7 +1,7 @@ #!/bin/bash # variables -VERSION=${VERSION:-$(date +"%Y.%m.%d_%H.%M")} +VERSION=${VERSION:-"trunk"} BUILD=${BUILD:-1} TAG=gwh @@ -27,10 +27,10 @@ cd $TMP [ ! -e $REPOSITORY ] && git clone https://github.com/ogham/exa.git $REPOSITORY cd $REPOSITORY git pull --all -VERSION="git_$( cd $REPOSITORY && git log -1 --format=%h_%ad --date=format:%Y.%m.%d )" cp -R $REPOSITORY $TMP/ cd $TMP/$PRGNAM +[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git log -1 --format=%h_%ad --date=format:%Y.%m.%d)" || git checkout $VERSION cargo build --release diff --git a/ap/f3/SlackBuild b/ap/f3/SlackBuild index f334777f..5abc1382 100755 --- a/ap/f3/SlackBuild +++ b/ap/f3/SlackBuild @@ -1,7 +1,7 @@ #!/bin/bash # variables -VERSION=${VERSION:-$(date +"%Y.%m.%d_%H.%M")} +VERSION=${VERSION:-"trunk"} BUILD=${BUILD:-1} TAG=gwh @@ -27,10 +27,10 @@ cd $TMP [ ! -e $REPOSITORY ] && git clone https://github.com/AltraMayor/f3.git $REPOSITORY cd $REPOSITORY git pull --all -VERSION="git_$( cd $REPOSITORY && git log -1 --format=%h_%ad --date=format:%Y.%m.%d )" cp -R $REPOSITORY $TMP/ cd $TMP/$PRGNAM +[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git log -1 --format=%h_%ad --date=format:%Y.%m.%d)" || git checkout $VERSION make all extra diff --git a/ap/fd/SlackBuild b/ap/fd/SlackBuild index b21fdeb5..53edbac7 100755 --- a/ap/fd/SlackBuild +++ b/ap/fd/SlackBuild @@ -1,7 +1,7 @@ #!/bin/bash # variables -VERSION=${VERSION:-$(date +"%Y.%m.%d_%H.%M")} +VERSION=${VERSION:-"trunk"} BUILD=${BUILD:-1} TAG=gwh @@ -27,10 +27,10 @@ cd $TMP [ ! -e $REPOSITORY ] && git clone https://github.com/sharkdp/fd.git $REPOSITORY cd $REPOSITORY git pull --all -VERSION="git_$( cd $REPOSITORY && git log -1 --format=%h_%ad --date=format:%Y.%m.%d )" cp -R $REPOSITORY $TMP/ cd $TMP/$PRGNAM +[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git log -1 --format=%h_%ad --date=format:%Y.%m.%d)" || git checkout $VERSION cargo build --release diff --git a/ap/getssl/SlackBuild b/ap/getssl/SlackBuild index e016d935..c22b70b4 100755 --- a/ap/getssl/SlackBuild +++ b/ap/getssl/SlackBuild @@ -1,7 +1,7 @@ #!/bin/bash # variables -#VERSION=${VERSION:-$(date +"%Y.%m.%d_%H.%M")} +VERSION=${VERSION:-"trunk"} BUILD=${BUILD:-1} TAG=gwh @@ -26,7 +26,7 @@ mkdir -p $PKG [ ! -e $REPOSITORY ] && git clone https://github.com/srvrco/getssl.git $REPOSITORY cd $REPOSITORY git pull --all -VERSION="git_$( cd $REPOSITORY && git log -1 --format=%h_%ad --date=format:%Y.%m.%d )" +[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git log -1 --format=%h_%ad --date=format:%Y.%m.%d)" || git checkout $VERSION mkdir -p $PKG$PREFIX/bin cp $REPOSITORY/getssl $PKG$PREFIX/bin/ diff --git a/ap/grex/SlackBuild b/ap/grex/SlackBuild index 38a68f8f..323855d3 100755 --- a/ap/grex/SlackBuild +++ b/ap/grex/SlackBuild @@ -1,7 +1,7 @@ #!/bin/bash # variables -VERSION=${VERSION:-$(date +"%Y.%m.%d_%H.%M")} +VERSION=${VERSION:-"trunk"} BUILD=${BUILD:-1} TAG=gwh @@ -27,10 +27,10 @@ cd $TMP [ ! -e $REPOSITORY ] && git clone https://github.com/pemistahl/grex.git $REPOSITORY cd $REPOSITORY git pull --all -VERSION="git_$( cd $REPOSITORY && git log -1 --format=%h_%ad --date=format:%Y.%m.%d )" cp -R $REPOSITORY $TMP/ cd $TMP/$PRGNAM +[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git log -1 --format=%h_%ad --date=format:%Y.%m.%d)" || git checkout $VERSION cargo build --release diff --git a/ap/ht/SlackBuild b/ap/ht/SlackBuild index edc631b0..ce0baf87 100755 --- a/ap/ht/SlackBuild +++ b/ap/ht/SlackBuild @@ -1,7 +1,7 @@ #!/bin/bash # variables -VERSION=${VERSION:-$(date +"%Y.%m.%d_%H.%M")} +VERSION=${VERSION:-"trunk"} BUILD=${BUILD:-1} TAG=gwh @@ -27,10 +27,10 @@ cd $TMP [ ! -e $REPOSITORY ] && git clone https://github.com/ducaale/ht.git $REPOSITORY cd $REPOSITORY git pull --all -VERSION="git_$( cd $REPOSITORY && git log -1 --format=%h_%ad --date=format:%Y.%m.%d )" cp -R $REPOSITORY $TMP/ cd $TMP/$PRGNAM +[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git log -1 --format=%h_%ad --date=format:%Y.%m.%d)" || git checkout $VERSION cargo build --release diff --git a/ap/httpie/SlackBuild b/ap/httpie/SlackBuild index c8415c1b..6ed28686 100755 --- a/ap/httpie/SlackBuild +++ b/ap/httpie/SlackBuild @@ -9,7 +9,7 @@ OUTPUT=/tmp PRGNAM=$(basename $CWD) PKG=$TMP/pkg-$PRGNAM -VERSION=$(date +%Y.%m.%d_%H.%M) +VERSION=${VERSION:-"trunk"} DOCS="LICENSE README.rst AUTHORS.rst" @@ -31,10 +31,10 @@ GIT_URL="https://github.com/jkbr/httpie.git" [ ! -e $REPOSITORY ] && git clone "$GIT_URL" $REPOSITORY cd $REPOSITORY git pull --all -VERSION="git_$( cd $REPOSITORY && git log -1 --format=%h_%ad --date=format:%Y.%m.%d )" cp -R $REPOSITORY $TMP/$PRGNAM cd $TMP/$PRGNAM +[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git log -1 --format=%h_%ad --date=format:%Y.%m.%d)" || git checkout $VERSION # installation python3 ./setup.py install --root=$PKG diff --git a/ap/hyperfine/SlackBuild b/ap/hyperfine/SlackBuild index 851c5c34..a7f94e97 100755 --- a/ap/hyperfine/SlackBuild +++ b/ap/hyperfine/SlackBuild @@ -1,7 +1,7 @@ #!/bin/bash # variables -VERSION=${VERSION:-$(date +"%Y.%m.%d_%H.%M")} +VERSION=${VERSION:-"trunk"} BUILD=${BUILD:-1} TAG=gwh @@ -27,10 +27,10 @@ cd $TMP [ ! -e $REPOSITORY ] && git clone https://github.com/sharkdp/hyperfine.git $REPOSITORY cd $REPOSITORY git pull --all -VERSION="git_$( cd $REPOSITORY && git log -1 --format=%h_%ad --date=format:%Y.%m.%d )" cp -R $REPOSITORY $TMP/ cd $TMP/$PRGNAM +[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git log -1 --format=%h_%ad --date=format:%Y.%m.%d)" || git checkout $VERSION cargo build --release diff --git a/ap/icr/SlackBuild b/ap/icr/SlackBuild index e878cf5c..a3cd0753 100755 --- a/ap/icr/SlackBuild +++ b/ap/icr/SlackBuild @@ -1,7 +1,7 @@ #!/bin/bash # variables -#VERSION=${VERSION:-$(date +"%Y.%m.%d_%H.%M")} +VERSION=${VERSION:-"trunk"} BUILD=${BUILD:-1} TAG=gwh @@ -26,10 +26,11 @@ mkdir -p $PKG $TMP [ ! -e $REPOSITORY ] && git clone https://github.com/crystal-community/icr.git $REPOSITORY cd $REPOSITORY git pull --all -VERSION="git_$( cd $REPOSITORY && git log -1 --format=%h_%ad --date=format:%Y.%m.%d )" cp -R $REPOSITORY $TMP/$PRGNAM cd $TMP/$PRGNAM +[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git log -1 --format=%h_%ad --date=format:%Y.%m.%d)" || git checkout $VERSION + make make install PREFIX=$PKG$PREFIX diff --git a/ap/ion/SlackBuild b/ap/ion/SlackBuild index f152980b..48909835 100755 --- a/ap/ion/SlackBuild +++ b/ap/ion/SlackBuild @@ -1,7 +1,7 @@ #!/bin/bash # variables -VERSION=${VERSION:-$(date +"%Y.%m.%d_%H.%M")} +VERSION=${VERSION:-"trunk"} BUILD=${BUILD:-1} TAG=gwh @@ -27,10 +27,10 @@ cd $TMP [ ! -e $REPOSITORY ] && git clone https://gitlab.redox-os.org/redox-os/ion/ $REPOSITORY cd $REPOSITORY git pull --all -VERSION="git_$( cd $REPOSITORY && git log -1 --format=%h_%ad --date=format:%Y.%m.%d )" cp -R $REPOSITORY $TMP/ cd $TMP/$PRGNAM +[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git log -1 --format=%h_%ad --date=format:%Y.%m.%d)" || git checkout $VERSION cargo build --release diff --git a/ap/ledger/SlackBuild b/ap/ledger/SlackBuild index f08b57a7..6eede6de 100755 --- a/ap/ledger/SlackBuild +++ b/ap/ledger/SlackBuild @@ -7,7 +7,7 @@ CWD=$(pwd) PRGNAM=$(basename $CWD) BRANCH=${BRANCH:="CURRENT"} -VERSION=${VERSION:=${BRANCH}_$(date +%F | tr - .)} +VERSION=${VERSION:-"trunk"} ARCH=${ARCH:-$(uname -m)} BUILD=${BUILD:-2} TAG=${TAG:-gwh} diff --git a/ap/lsd/SlackBuild b/ap/lsd/SlackBuild index e2979c1e..b55f2d9d 100755 --- a/ap/lsd/SlackBuild +++ b/ap/lsd/SlackBuild @@ -1,7 +1,7 @@ #!/bin/bash # variables -VERSION=${VERSION:-$(date +"%Y.%m.%d_%H.%M")} +VERSION=${VERSION:-"trunk"} BUILD=${BUILD:-1} TAG=gwh @@ -27,10 +27,10 @@ cd $TMP [ ! -e $REPOSITORY ] && git clone https://github.com/Peltoche/lsd.git $REPOSITORY cd $REPOSITORY git pull --all -VERSION="git_$( cd $REPOSITORY && git log -1 --format=%h_%ad --date=format:%Y.%m.%d )" cp -R $REPOSITORY $TMP/ cd $TMP/$PRGNAM +[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git log -1 --format=%h_%ad --date=format:%Y.%m.%d)" || git checkout $VERSION cargo build --release diff --git a/ap/lsyncd/SlackBuild b/ap/lsyncd/SlackBuild index f2174d7c..8806b2d6 100755 --- a/ap/lsyncd/SlackBuild +++ b/ap/lsyncd/SlackBuild @@ -4,7 +4,7 @@ CWD=$(pwd) PRGNAM=$(basename $CWD) -VERSION=${VERSION:-$(date +"%Y.%m.%d_%H.%M")} +VERSION=${VERSION:-"trunk"} ARCH=${ARCH:-$(uname -m)} BUILD=1 @@ -28,10 +28,9 @@ mkdir -p $PKG cd $TMP [ ! -e $REPOSITORY ] && git clone https://github.com/axkibe/lsyncd.git $REPOSITORY -VERSION="git_$( cd $REPOSITORY && git log -1 --format=%h_%ad --date=format:%Y.%m.%d )" cp -R $REPOSITORY $TMP/$PRGNAM-$VERSION - cd $TMP/$PRGNAM-$VERSION +[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git log -1 --format=%h_%ad --date=format:%Y.%m.%d)" || git checkout $VERSION # configuration cmake \ diff --git a/ap/motion/SlackBuild b/ap/motion/SlackBuild index c94db80d..74f487b6 100755 --- a/ap/motion/SlackBuild +++ b/ap/motion/SlackBuild @@ -25,7 +25,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=motion -VERSION=$(date +%F | tr - .) +VERSION=${VERSION:-"trunk"} BUILD=${BUILD:-1} TAG=${TAG:-gwh} @@ -63,10 +63,10 @@ rm -rf $PRGNAM [ ! -e $REPOSITORY ] && git clone https://github.com/Motion-Project/motion $REPOSITORY cd $REPOSITORY git pull --all -VERSION="git_$( cd $REPOSITORY && git log -1 --format=%h_%ad --date=format:%Y.%m.%d )" cp -R $REPOSITORY $PRGNAM cd $PRGNAM +[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git log -1 --format=%h_%ad --date=format:%Y.%m.%d)" || git checkout $VERSION chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \ diff --git a/ap/nu/SlackBuild b/ap/nu/SlackBuild index 81a50c96..d9c396ab 100755 --- a/ap/nu/SlackBuild +++ b/ap/nu/SlackBuild @@ -1,7 +1,7 @@ #!/bin/bash # variables -VERSION=${VERSION:-$(date +"%Y.%m.%d_%H.%M")} +VERSION=${VERSION:-"trunk"} BUILD=${BUILD:-1} TAG=gwh @@ -27,10 +27,10 @@ cd $TMP [ ! -e $REPOSITORY ] && git clone https://github.com/nushell/nushell.git $REPOSITORY cd $REPOSITORY git pull --all -VERSION="git_$( cd $REPOSITORY && git log -1 --format=%h_%ad --date=format:%Y.%m.%d )" cp -R $REPOSITORY $TMP/ cd $TMP/$PRGNAM +[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git log -1 --format=%h_%ad --date=format:%Y.%m.%d)" || git checkout $VERSION cargo build --release diff --git a/ap/procs/SlackBuild b/ap/procs/SlackBuild index c8a1782d..1ecce381 100755 --- a/ap/procs/SlackBuild +++ b/ap/procs/SlackBuild @@ -1,7 +1,7 @@ #!/bin/bash # variables -VERSION=${VERSION:-$(date +"%Y.%m.%d_%H.%M")} +VERSION=${VERSION:-"trunk"} BUILD=${BUILD:-1} TAG=gwh @@ -27,10 +27,10 @@ cd $TMP [ ! -e $REPOSITORY ] && git clone https://github.com/dalance/procs.git $REPOSITORY cd $REPOSITORY git pull --all -VERSION="git_$( cd $REPOSITORY && git log -1 --format=%h_%ad --date=format:%Y.%m.%d )" cp -R $REPOSITORY $TMP/ cd $TMP/$PRGNAM +[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git log -1 --format=%h_%ad --date=format:%Y.%m.%d)" || git checkout $VERSION cargo build --release diff --git a/ap/ripgrep/SlackBuild b/ap/ripgrep/SlackBuild index 02129690..46a9c5c2 100755 --- a/ap/ripgrep/SlackBuild +++ b/ap/ripgrep/SlackBuild @@ -1,7 +1,7 @@ #!/bin/bash # variables -VERSION=${VERSION:-$(date +"%Y.%m.%d_%H.%M")} +VERSION=${VERSION:-"trunk"} BUILD=${BUILD:-1} TAG=gwh @@ -27,10 +27,10 @@ cd $TMP [ ! -e $REPOSITORY ] && git clone https://github.com/BurntSushi/ripgrep.git $REPOSITORY cd $REPOSITORY git pull --all -VERSION="git_$( cd $REPOSITORY && git log -1 --format=%h_%ad --date=format:%Y.%m.%d )" cp -R $REPOSITORY $TMP/ cd $TMP/$PRGNAM +[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git log -1 --format=%h_%ad --date=format:%Y.%m.%d)" || git checkout $VERSION cargo build --release diff --git a/ap/rustup/SlackBuild b/ap/rustup/SlackBuild index f1b9fac5..2bff6fdb 100755 --- a/ap/rustup/SlackBuild +++ b/ap/rustup/SlackBuild @@ -1,6 +1,7 @@ #!/bin/bash # variables +VERSION=${VERSION:-"trunk"} BUILD=${BUILD:-1} TAG=gwh @@ -26,10 +27,10 @@ cd $TMP [ ! -e $REPOSITORY ] && git clone https://github.com/rust-lang/rustup.git $REPOSITORY cd $REPOSITORY git pull --all -VERSION="git_$( cd $REPOSITORY && git log -1 --format=%h_%ad --date=format:%Y.%m.%d )" cp -R $REPOSITORY $TMP/ cd $TMP/$PRGNAM +[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git log -1 --format=%h_%ad --date=format:%Y.%m.%d)" || git checkout $VERSION cargo build --release --features no-self-update diff --git a/ap/sd/SlackBuild b/ap/sd/SlackBuild index fefa26c3..a6e463bc 100755 --- a/ap/sd/SlackBuild +++ b/ap/sd/SlackBuild @@ -1,7 +1,7 @@ #!/bin/bash # variables -VERSION=${VERSION:-$(date +"%Y.%m.%d_%H.%M")} +VERSION=${VERSION:-"trunk"} BUILD=${BUILD:-1} TAG=gwh @@ -27,10 +27,10 @@ cd $TMP [ ! -e $REPOSITORY ] && git clone https://github.com/chmln/sd.git $REPOSITORY cd $REPOSITORY git pull --all -VERSION="git_$( cd $REPOSITORY && git log -1 --format=%h_%ad --date=format:%Y.%m.%d )" cp -R $REPOSITORY $TMP/ cd $TMP/$PRGNAM +[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git log -1 --format=%h_%ad --date=format:%Y.%m.%d)" || git checkout $VERSION cargo build --release diff --git a/ap/starship/SlackBuild b/ap/starship/SlackBuild index 9bc6d484..b804692a 100755 --- a/ap/starship/SlackBuild +++ b/ap/starship/SlackBuild @@ -1,7 +1,7 @@ #!/bin/bash # variables -VERSION=${VERSION:-$(date +"%Y.%m.%d_%H.%M")} +VERSION=${VERSION:-"trunk"} BUILD=${BUILD:-1} TAG=gwh @@ -27,10 +27,10 @@ cd $TMP [ ! -e $REPOSITORY ] && git clone https://github.com/starship/starship.git $REPOSITORY cd $REPOSITORY git pull --all -VERSION="git_$( cd $REPOSITORY && git log -1 --format=%h_%ad --date=format:%Y.%m.%d )" cp -R $REPOSITORY $TMP/ cd $TMP/$PRGNAM +[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git log -1 --format=%h_%ad --date=format:%Y.%m.%d)" || git checkout $VERSION cargo build --release diff --git a/ap/stow/SlackBuild b/ap/stow/SlackBuild index 472f42ba..0687ddb8 100755 --- a/ap/stow/SlackBuild +++ b/ap/stow/SlackBuild @@ -1,7 +1,7 @@ #!/bin/bash # variables -# VERSION=${VERSION:-$(date +"%Y.%m.%d_%H.%M")} +VERSION=${VERSION:-"trunk"} BUILD=${BUILD:-1} TAG=gwh @@ -27,10 +27,10 @@ cd $TMP [ ! -e $REPOSITORY ] && git clone http://github.com/aspiers/stow.git $REPOSITORY cd $REPOSITORY git pull --all -VERSION="git_$( cd $REPOSITORY && git log -1 --format=%h_%ad --date=format:%Y.%m.%d )" cp -R $REPOSITORY $TMP/ cd $TMP/$PRGNAM +[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git log -1 --format=%h_%ad --date=format:%Y.%m.%d)" || git checkout $VERSION autoconf aclocal --force diff --git a/ap/tldr/SlackBuild b/ap/tldr/SlackBuild index 79cc876f..34808a2c 100755 --- a/ap/tldr/SlackBuild +++ b/ap/tldr/SlackBuild @@ -1,7 +1,7 @@ #!/bin/bash # variables -VERSION=${VERSION:-$(date +"%Y.%m.%d_%H.%M")} +VERSION=${VERSION:-"trunk"} BUILD=${BUILD:-1} TAG=gwh @@ -27,10 +27,10 @@ cd $TMP [ ! -e $REPOSITORY ] && git clone https://github.com/dbrgn/tealdeer.git $REPOSITORY cd $REPOSITORY git pull --all -VERSION="git_$( cd $REPOSITORY && git log -1 --format=%h_%ad --date=format:%Y.%m.%d )" cp -R $REPOSITORY $TMP/ cd $TMP/$PRGNAM +[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git log -1 --format=%h_%ad --date=format:%Y.%m.%d)" || git checkout $VERSION cargo build --release diff --git a/ap/wp-cli/SlackBuild b/ap/wp-cli/SlackBuild index a7ea87e0..4a66011e 100755 --- a/ap/wp-cli/SlackBuild +++ b/ap/wp-cli/SlackBuild @@ -4,7 +4,7 @@ CWD=$(pwd) PRGNAM=$(basename $CWD) -VERSION=${VERSION:-$(date +"%Y.%m.%d_%H.%M")} +VERSION=${VERSION:-"trunk"} ARCH=noarch BUILD=1 diff --git a/ap/ycmd/SlackBuild b/ap/ycmd/SlackBuild index a328ca32..80f2851f 100755 --- a/ap/ycmd/SlackBuild +++ b/ap/ycmd/SlackBuild @@ -1,6 +1,7 @@ #!/bin/bash # variables +VERSION=${VERSION:-"trunk"} BUILD=${BUILD:-1} TAG=gwh @@ -26,10 +27,10 @@ cd $TMP [ ! -e $REPOSITORY ] && git clone https://github.com/Valloric/ycmd.git $REPOSITORY cd $REPOSITORY git pull --all -VERSION="git_$( cd $REPOSITORY && git log -1 --format=%h_%ad --date=format:%Y.%m.%d )" cp -R $REPOSITORY $TMP/ cd $TMP/$PRGNAM +[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git log -1 --format=%h_%ad --date=format:%Y.%m.%d)" || git checkout $VERSION git submodule update --init --recursive TERM=xterm \ diff --git a/ap/ytop/SlackBuild b/ap/ytop/SlackBuild index 8259e96d..607c1ba9 100755 --- a/ap/ytop/SlackBuild +++ b/ap/ytop/SlackBuild @@ -1,7 +1,7 @@ #!/bin/bash # variables -VERSION=${VERSION:-$(date +"%Y.%m.%d_%H.%M")} +VERSION=${VERSION:-"trunk"} BUILD=${BUILD:-1} TAG=gwh @@ -27,10 +27,10 @@ cd $TMP [ ! -e $REPOSITORY ] && git clone https://github.com/cjbassi/ytop.git $REPOSITORY cd $REPOSITORY git pull --all -VERSION="git_$( cd $REPOSITORY && git log -1 --format=%h_%ad --date=format:%Y.%m.%d )" cp -R $REPOSITORY $TMP/ cd $TMP/$PRGNAM +[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git log -1 --format=%h_%ad --date=format:%Y.%m.%d)" || git checkout $VERSION cargo build --release diff --git a/d/ameba/SlackBuild b/d/ameba/SlackBuild index 6b7f3e28..31d26c6c 100755 --- a/d/ameba/SlackBuild +++ b/d/ameba/SlackBuild @@ -4,7 +4,7 @@ CWD=$(pwd) PRGNAM=$(basename $CWD) -#VERSION=${VERSION:-$(date +"%Y.%m.%d_%H.%M")} +VERSION=${VERSION:-"trunk"} ARCH=${ARCH:-$(uname -m)} BUILD=1 @@ -28,10 +28,9 @@ mkdir -p $PKG cd $TMP [ ! -e $REPOSITORY ] && git clone https://github.com/crystal-ameba/ameba.git $REPOSITORY -VERSION="git_$( cd $REPOSITORY && git log -1 --format=%h_%ad --date=format:%Y.%m.%d )" -cp -R $REPOSITORY $TMP/$PRGNAM-$VERSION - -cd $TMP/$PRGNAM-$VERSION +cp -R $REPOSITORY $TMP/$PRGNAM +cd $TMP/$PRGNAM +[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git log -1 --format=%h_%ad --date=format:%Y.%m.%d)" || git checkout $VERSION # compilation shards build --verbose --release diff --git a/d/chruby/SlackBuild b/d/chruby/SlackBuild index 30bd2f49..341249ec 100755 --- a/d/chruby/SlackBuild +++ b/d/chruby/SlackBuild @@ -11,7 +11,7 @@ PKG=$TMP/pkg-$PRGNAM REPOSITORY=/home/installs/SlackBuilds/repositories/$PRGNAM -VERSION=$(date +%Y.%m%d_%H.%M) +VERSION=${VERSION:-"trunk"} ARCH='noarch' BUILD=1 @@ -26,14 +26,14 @@ mkdir -p $PKG [ ! -e $REPOSITORY ] && git clone https://github.com/postmodern/chruby $REPOSITORY cd $REPOSITORY git pull --all -VERSION="git_$( cd $REPOSITORY && git log -1 --format=%h_%ad --date=format:%Y.%m.%d )" # nettoyage préalable -rm -fr $PKG $TMP/$PRGNAM-$VERSION +rm -fr $PKG $TMP/$PRGNAM -cp -R $REPOSITORY $TMP/$PRGNAM-$VERSION -cd $TMP/$PRGNAM-$VERSION +cp -R $REPOSITORY $TMP/$PRGNAM +cd $TMP/$PRGNAM +[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git log -1 --format=%h_%ad --date=format:%Y.%m.%d)" || git checkout $VERSION # compilation make -j3 PREFIX=$PREFIX diff --git a/d/dtc/SlackBuild b/d/dtc/SlackBuild index b741dbb0..a2655de6 100755 --- a/d/dtc/SlackBuild +++ b/d/dtc/SlackBuild @@ -1,7 +1,7 @@ #!/bin/bash # variables -VERSION=${VERSION:-$(date +"%Y.%m.%d_%H.%M")} +VERSION=${VERSION:-"trunk"} BUILD=${BUILD:-1} TAG=gwh @@ -27,10 +27,10 @@ cd $TMP [ ! -e $REPOSITORY ] && git clone git://git.kernel.org/pub/scm/utils/dtc/dtc.git $REPOSITORY cd $REPOSITORY git pull --all -VERSION="git_$( cd $REPOSITORY && git log -1 --format=%h_%ad --date=format:%Y.%m.%d )" cp -R $REPOSITORY $TMP/ cd $TMP/$PRGNAM +[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git log -1 --format=%h_%ad --date=format:%Y.%m.%d)" || git checkout $VERSION make make install PREFIX=$PKG$PREFIX LIBDIR=$PKG$PREFIX/lib$(uname -m | grep -o 64) diff --git a/d/rbspy/SlackBuild b/d/rbspy/SlackBuild index bbdfbf70..9a1ae14d 100755 --- a/d/rbspy/SlackBuild +++ b/d/rbspy/SlackBuild @@ -1,7 +1,7 @@ #!/bin/bash # variables -VERSION=${VERSION:-$(date +"%Y.%m.%d_%H.%M")} +VERSION=${VERSION:-"trunk"} BUILD=${BUILD:-1} TAG=gwh @@ -27,10 +27,10 @@ cd $TMP [ ! -e $REPOSITORY ] && git clone https://github.com/rbspy/rbspy.git $REPOSITORY cd $REPOSITORY git pull --all -VERSION="git_$( cd $REPOSITORY && git log -1 --format=%h_%ad --date=format:%Y.%m.%d )" cp -R $REPOSITORY $TMP/ cd $TMP/$PRGNAM +[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git log -1 --format=%h_%ad --date=format:%Y.%m.%d)" || git checkout $VERSION cargo build --release diff --git a/d/rpn/SlackBuild b/d/rpn/SlackBuild index b9572468..d8c1e9ab 100755 --- a/d/rpn/SlackBuild +++ b/d/rpn/SlackBuild @@ -4,7 +4,7 @@ CWD=$(pwd) PRGNAM=$(basename $CWD) -VERSION=${VERSION:-$(date +"%Y.%m.%d_%H.%M")} +VERSION=${VERSION:-"trunk"} ARCH=${ARCH:-$(uname -m)} BUILD=1 @@ -28,10 +28,9 @@ mkdir -p $PKG cd $TMP [ ! -e $REPOSITORY ] && git clone https://github.com/louisrubet/rpn.git $REPOSITORY -VERSION="git_$( cd $REPOSITORY && git log -1 --format=%h_%ad --date=format:%Y.%m.%d )" cp -R $REPOSITORY $TMP/$PRGNAM-$VERSION - cd $TMP/$PRGNAM-$VERSION +[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git log -1 --format=%h_%ad --date=format:%Y.%m.%d)" || git checkout $VERSION sed -i 's|git@github.com:|https://github.com/|g' $(grep -l git@ .*) diff --git a/d/ruby-install/SlackBuild b/d/ruby-install/SlackBuild index 6b2ddeb0..7cf5b6c4 100755 --- a/d/ruby-install/SlackBuild +++ b/d/ruby-install/SlackBuild @@ -10,7 +10,7 @@ PRGNAM=$(basename $CWD) PKG=$TMP/pkg-$PRGNAM REPOSITORY=/home/installs/SlackBuilds/repositories/$PRGNAM -VERSION=$(date +%Y.%m%d_%H.%M) +VERSION=${VERSION:-"trunk"} ARCH='noarch' BUILD=1 @@ -23,14 +23,14 @@ mkdir -p $PKG [ ! -e $REPOSITORY ] && git clone https://github.com/postmodern/ruby-install $REPOSITORY cd $REPOSITORY git pull --all -VERSION="git_$( cd $REPOSITORY && git log -1 --format=%h_%ad --date=format:%Y.%m.%d )" # nettoyage préalable -rm -fr $PKG $TMP/$PRGNAM-$VERSION +rm -fr $PKG $TMP/$PRGNAM -cp -R $REPOSITORY $TMP/$PRGNAM-$VERSION -cd $TMP/$PRGNAM-$VERSION +cp -R $REPOSITORY $TMP/$PRGNAM +cd $TMP/$PRGNAM +[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git log -1 --format=%h_%ad --date=format:%Y.%m.%d)" || git checkout $VERSION # compilation make -j3 PREFIX=$PREFIX diff --git a/d/scry/SlackBuild b/d/scry/SlackBuild index 42f5c19d..eedfdf9b 100755 --- a/d/scry/SlackBuild +++ b/d/scry/SlackBuild @@ -4,7 +4,7 @@ CWD=$(pwd) PRGNAM=$(basename $CWD) -VERSION=${VERSION:-$(date +"%Y.%m.%d_%H.%M")} +VERSION=${VERSION:-"trunk"} ARCH=${ARCH:-$(uname -m)} BUILD=1 @@ -28,10 +28,9 @@ mkdir -p $PKG cd $TMP [ ! -e $REPOSITORY ] && git clone https://github.com/crystal-lang-tools/scry.git $REPOSITORY -VERSION="git_$( cd $REPOSITORY && git log -1 --format=%h_%ad --date=format:%Y.%m.%d )" cp -R $REPOSITORY $TMP/$PRGNAM-$VERSION - cd $TMP/$PRGNAM-$VERSION +[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git log -1 --format=%h_%ad --date=format:%Y.%m.%d)" || git checkout $VERSION sed -i 's|Errno|File::Error|g' src/scry/text_document.cr diff --git a/d/wabt/SlackBuild b/d/wabt/SlackBuild index 50e0ccd4..9c67298a 100755 --- a/d/wabt/SlackBuild +++ b/d/wabt/SlackBuild @@ -4,7 +4,7 @@ CWD=$(pwd) PRGNAM=$(basename $CWD) -VERSION=${VERSION:-$(date +"%Y.%m.%d_%H.%M")} +VERSION=${VERSION:-"trunk"} ARCH=${ARCH:-$(uname -m)} BUILD=1 @@ -28,10 +28,9 @@ mkdir -p $PKG cd $TMP [ ! -e $REPOSITORY ] && git clone --recursive https://github.com/WebAssembly/wabt.git $REPOSITORY -VERSION="git_$( cd $REPOSITORY && git log -1 --format=%h_%ad --date=format:%Y.%m.%d )" cp -R $REPOSITORY $TMP/$PRGNAM-$VERSION - cd $TMP/$PRGNAM-$VERSION +[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git log -1 --format=%h_%ad --date=format:%Y.%m.%d)" || git checkout $VERSION # configuration mkdir build diff --git a/e/emacs/SlackBuild b/e/emacs/SlackBuild index 0fcf40e1..1a50b4e2 100755 --- a/e/emacs/SlackBuild +++ b/e/emacs/SlackBuild @@ -32,6 +32,7 @@ BUILD=${BUILD:-1} TAG=gwh BRANCH=${BRANCH:-master} +VERSION=${VERSION:-"trunk"} REPOSITORY=/home/installs/SlackBuilds/repositories/$PKGNAM @@ -88,12 +89,13 @@ rm -rf $PKGNAM git pull [ -e Makefile ] && make distclean ) -VERSION="git_$( cd $REPOSITORY && git log -1 --format=%h_%ad --date=format:%Y.%m.%d )" +[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git log -1 --format=%h_%ad --date=format:%Y.%m.%d)" mkdir -p $TMP/$PKGNAM SRCDIR=$REPOSITORY cd $PKGNAM || exit 1 +[ "x$VERSION" == "xtrunk" ] || git checkout $VERSION # tar xvf $CWD/$PKGNAM-$TARBALLVER.tar.xz || exit 1 # cd $PKGNAM-$SRCDIRVER || exit 1 diff --git a/l/apcu/SlackBuild b/l/apcu/SlackBuild index 9c211337..c60642d6 100755 --- a/l/apcu/SlackBuild +++ b/l/apcu/SlackBuild @@ -9,7 +9,7 @@ CWD=$(pwd) PRGNAM=$(basename $CWD) PKG=$TMP/pkg-$PRGNAM -VERSION=$(date +%Y.%m.%d_%H.%M) +VERSION=${VERSION:-"trunk"} EXT=tar.gz @@ -33,10 +33,10 @@ mkdir -p $PKG [ ! -e $REPOSITORY ] && git clone https://github.com/krakjoe/apcu.git $REPOSITORY cd $REPOSITORY git pull --all -VERSION="git_$( cd $REPOSITORY && git log -1 --format=%h_%ad --date=format:%Y.%m.%d )" cp -R $REPOSITORY $PRGNAM cd $PRGNAM +[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git log -1 --format=%h_%ad --date=format:%Y.%m.%d)" || git checkout $VERSION # configuration phpize diff --git a/l/fmt/SlackBuild b/l/fmt/SlackBuild index 1623f2a4..c52312f4 100755 --- a/l/fmt/SlackBuild +++ b/l/fmt/SlackBuild @@ -4,7 +4,7 @@ CWD=$(pwd) PRGNAM=$(basename $CWD) -VERSION=${VERSION:-$(date +"%Y.%m.%d_%H.%M")} +VERSION=${VERSION:-"trunk"} ARCH=${ARCH:-$(uname -m)} BUILD=1 @@ -28,10 +28,9 @@ mkdir -p $PKG cd $TMP [ ! -e $REPOSITORY ] && git clone https://github.com/fmtlib/fmt.git $REPOSITORY -VERSION="git_$( cd $REPOSITORY && git log -1 --format=%h_%ad --date=format:%Y.%m.%d )" cp -R $REPOSITORY $TMP/$PRGNAM - cd $TMP/$PRGNAM +[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git log -1 --format=%h_%ad --date=format:%Y.%m.%d)" || git checkout $VERSION # configuration cmake \ diff --git a/l/raylib/SlackBuild b/l/raylib/SlackBuild index 42d43516..cdec0592 100755 --- a/l/raylib/SlackBuild +++ b/l/raylib/SlackBuild @@ -1,7 +1,7 @@ #!/bin/bash # variables -VERSION=master_$(date +"%Y.%m.%d_%H.%M") +VERSION=${VERSION:-"trunk"} BUILD=1 TAG=gwh @@ -29,11 +29,13 @@ mkdir -p $PKG [ ! -e $REPOSITORY ] && git clone https://github.com/raysan5/raylib.git $REPOSITORY cd $REPOSITORY git pull --all -VERSION="git_$( cd $REPOSITORY && git log -1 --format=%h_%ad --date=format:%Y.%m.%d )" cp -R $REPOSITORY $TMP/ +cd $TMP/$PRGNAM -cd $TMP/$PRGNAM/src +[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git log -1 --format=%h_%ad --date=format:%Y.%m.%d)" || git checkout $VERSION + +cd src make PLATFORM=PLATFORM_DESKTOP RAYLIB_LIBTYPE=SHARED make install DESTDIR=$PKG RAYLIB_LIBTYPE=SHARED RAYLIB_INSTALL_PATH=$PKG$PREFIX/lib$(uname -m | grep -o 64) diff --git a/l/spdlog/SlackBuild b/l/spdlog/SlackBuild index d032ab7f..84275223 100755 --- a/l/spdlog/SlackBuild +++ b/l/spdlog/SlackBuild @@ -4,7 +4,7 @@ CWD=$(pwd) PRGNAM=$(basename $CWD) -VERSION=${VERSION:-$(date +"%Y.%m.%d_%H.%M")} +VERSION=${VERSION:-"trunk"} ARCH=${ARCH:-$(uname -m)} BUILD=1 @@ -28,11 +28,11 @@ mkdir -p $PKG cd $TMP [ ! -e $REPOSITORY ] && git clone https://github.com/gabime/spdlog.git $REPOSITORY -VERSION="git_$( cd $REPOSITORY && git log -1 --format=%h_%ad --date=format:%Y.%m.%d )" cp -R $REPOSITORY $TMP/$PRGNAM - cd $TMP/$PRGNAM +[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git log -1 --format=%h_%ad --date=format:%Y.%m.%d)" || git checkout $VERSION + # configuration cmake \ -DCMAKE_INSTALL_PREFIX=$PREFIX \ diff --git a/lua/lgi/SlackBuild b/lua/lgi/SlackBuild index 3dde63d3..11b91e3f 100755 --- a/lua/lgi/SlackBuild +++ b/lua/lgi/SlackBuild @@ -5,7 +5,7 @@ CWD=$(pwd) # default settings PRGNAM=$(basename $CWD) ARCH=$(uname -m) -VERSION=${VERSION:-$(date +%Y.%m.%d_%H.%M)} +VERSION=${VERSION:-"trunk"} BUILD=1 diff --git a/lua/luarocks/SlackBuild b/lua/luarocks/SlackBuild index e5ef54e8..52303ff8 100755 --- a/lua/luarocks/SlackBuild +++ b/lua/luarocks/SlackBuild @@ -1,6 +1,7 @@ #!/bin/bash # variables +VERSION=${VERSION:-"trunk"} TAG=gwh TMP=/tmp/$TAG @@ -33,12 +34,12 @@ cd $TMP ( cd $REPOSITORIES/$PRGNAM; git pull ) -VERSION="git_$( cd $REPOSITORY && git log -1 --format=%h_%ad --date=format:%Y.%m.%d )" cp -R $REPOSITORIES/$PRGNAM $TMP/$PRGNAM - cd $PRGNAM +[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git log -1 --format=%h_%ad --date=format:%Y.%m.%d)" || git checkout $VERSION + # configuration CFLAGS=$SLCKFLAGS \ CPPFLAGS=$SLCKFLAGS \ diff --git a/n/calibre-web/SlackBuild b/n/calibre-web/SlackBuild index 35d687d7..c50a1211 100755 --- a/n/calibre-web/SlackBuild +++ b/n/calibre-web/SlackBuild @@ -3,6 +3,7 @@ # variables RUNNING_USER=${RUNNING_USER:-gwh} RUNNING_GROUP=${RUNNING_GROUP:-users} +VERSION=${VERSION:-"trunk"} BUILD=${BUILD:-1} TAG=gwh @@ -27,7 +28,6 @@ mkdir -p $PKG [ ! -e $REPOSITORY ] && git clone https://github.com/janeczku/calibre-web.git $REPOSITORY cd $REPOSITORY git pull --all -VERSION="git_$( cd $REPOSITORY && git log -1 --format=%h_%ad --date=format:%Y.%m.%d )" mkdir -p $PKG/opt cp -r $REPOSITORY $PKG/opt/ @@ -39,6 +39,8 @@ cp -r $CWD/rc $PKG/etc/rc.d/rc.$PRGNAM sed -i "s|RUNNING_USER|$RUNNING_USER|" $PKG/etc/rc.d/rc.$PRGNAM cd $PKG/opt/$PRGNAM +[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git log -1 --format=%h_%ad --date=format:%Y.%m.%d)" || git checkout $VERSION + # change default password NEW_DEFAULT_PASSWORD=$(< /dev/urandom tr -dc _A-Z-a-z-0-9 | head -c${1:-32};echo;) sed -i "s|admin123|$NEW_DEFAULT_PASSWORD|g" cps/* diff --git a/n/pluxml/SlackBuild b/n/pluxml/SlackBuild index fcdaef6d..037b2ab0 100755 --- a/n/pluxml/SlackBuild +++ b/n/pluxml/SlackBuild @@ -3,6 +3,7 @@ CWD=$(pwd) PRGNAM=$(basename $CWD) +VERSION=${VERSION:-"trunk"} ARCH="noarch" # hardcode ARCH BUILD=${BUILD:-1} TAG=${TAG:-gwh} @@ -28,13 +29,14 @@ REPOSITORY=/home/installs/SlackBuilds/repositories/$PRGNAM ( cd $REPOSITORY git pull ) -VERSION="git_$( cd $REPOSITORY && git log -1 --format=%h_%ad --date=format:%Y.%m.%d )" - cp -R $REPOSITORY $PKG/$VHOSTROOT/htdocs +cd $PKG/$VHOSTROOT/htdocs + +[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git log -1 --format=%h_%ad --date=format:%Y.%m.%d)" || git checkout $VERSION + rm -fr $PKG/$VHOSTROOT/htdocs/.git mv $PKG/$VHOSTROOT/htdocs/install.php $PKG/$VHOSTROOT/htdocs/install.php.disabled -cd $PKG/$VHOSTROOT/htdocs chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 -o -perm 755 \) \ diff --git a/wayland/dmenu-wayland/SlackBuild b/wayland/dmenu-wayland/SlackBuild index 838ef62b..2bc6483a 100755 --- a/wayland/dmenu-wayland/SlackBuild +++ b/wayland/dmenu-wayland/SlackBuild @@ -1,7 +1,7 @@ #!/bin/bash # variables -VERSION=master_$(date +"%Y.%m.%d_%H.%M") +VERSION=${VERSION:-"trunk"} BUILD=1 TAG=gwh @@ -26,11 +26,12 @@ mkdir -p $PKG [ ! -e $REPOSITORY ] && git clone https://github.com/nyyManni/dmenu-wayland $REPOSITORY cd $REPOSITORY git pull --all -VERSION="git_$( cd $REPOSITORY && git log -1 --format=%h_%ad --date=format:%Y.%m.%d )" cp -R $REPOSITORY $TMP/ - cd $TMP/$PRGNAM/ + +[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git log -1 --format=%h_%ad --date=format:%Y.%m.%d)" || git checkout $VERSION + meson setup \ --prefix /usr \ --mandir /usr/man/ \ diff --git a/wayland/dwl/SlackBuild b/wayland/dwl/SlackBuild index 294d9dfd..112559b0 100755 --- a/wayland/dwl/SlackBuild +++ b/wayland/dwl/SlackBuild @@ -1,7 +1,7 @@ #!/bin/bash # variables -VERSION=master_$(date +"%Y.%m.%d_%H.%M") +VERSION=${VERSION:-"trunk"} BUILD=1 TAG=gwh @@ -26,12 +26,12 @@ mkdir -p $PKG [ ! -e $REPOSITORY ] && git clone https://github.com/djpohly/dwl.git $REPOSITORY cd $REPOSITORY git pull --all -VERSION="git_$( cd $REPOSITORY && git log -1 --format=%h_%ad --date=format:%Y.%m.%d )" cp -R $REPOSITORY $TMP/ - cd $TMP/$PRGNAM/ +[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git log -1 --format=%h_%ad --date=format:%Y.%m.%d)" || git checkout $VERSION + # configuration [ -e $CWD/config.h ] && cat $CWD/config.h > config.h diff --git a/wayland/foot/SlackBuild b/wayland/foot/SlackBuild index d1338380..60a8e2d3 100755 --- a/wayland/foot/SlackBuild +++ b/wayland/foot/SlackBuild @@ -1,7 +1,7 @@ #!/bin/bash # variables -VERSION=master_$(date +"%Y.%m.%d_%H.%M") +VERSION=${VERSION:-"trunk"} BUILD=1 TAG=gwh @@ -26,11 +26,12 @@ mkdir -p $PKG [ ! -e $REPOSITORY ] && git clone https://codeberg.org/dnkl/foot.git $REPOSITORY cd $REPOSITORY git pull --all -VERSION="git_$( cd $REPOSITORY && git log -1 --format=%h_%ad --date=format:%Y.%m.%d )" cp -R $REPOSITORY $TMP/ - cd $TMP/$PRGNAM/ + +[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git log -1 --format=%h_%ad --date=format:%Y.%m.%d)" || git checkout $VERSION + meson setup \ --prefix /usr \ --mandir /usr/man/ \ diff --git a/wayland/kanshi/SlackBuild b/wayland/kanshi/SlackBuild index bcdd358e..566b9aed 100755 --- a/wayland/kanshi/SlackBuild +++ b/wayland/kanshi/SlackBuild @@ -1,7 +1,7 @@ #!/bin/bash # variables -VERSION=master_$(date +"%Y.%m.%d_%H.%M") +VERSION=${VERSION:-"trunk"} BUILD=1 TAG=gwh @@ -26,11 +26,12 @@ mkdir -p $PKG [ ! -e $REPOSITORY ] && git clone https://github.com/emersion/kanshi $REPOSITORY cd $REPOSITORY git pull --all -VERSION="git_$( cd $REPOSITORY && git log -1 --format=%h_%ad --date=format:%Y.%m.%d )" cp -R $REPOSITORY $TMP/ - cd $TMP/$PRGNAM/ + +[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git log -1 --format=%h_%ad --date=format:%Y.%m.%d)" || git checkout $VERSION + meson setup \ --prefix /usr \ --mandir /usr/man/ \ diff --git a/wayland/mako/SlackBuild b/wayland/mako/SlackBuild index 6688f032..bee829bf 100755 --- a/wayland/mako/SlackBuild +++ b/wayland/mako/SlackBuild @@ -1,7 +1,7 @@ #!/bin/bash # variables -VERSION=master_$(date +"%Y.%m.%d_%H.%M") +VERSION=${VERSION:-"trunk"} BUILD=1 TAG=gwh @@ -26,11 +26,12 @@ mkdir -p $PKG [ ! -e $REPOSITORY ] && git clone https://github.com/emersion/mako $REPOSITORY cd $REPOSITORY git pull --all -VERSION="git_$( cd $REPOSITORY && git log -1 --format=%h_%ad --date=format:%Y.%m.%d )" cp -R $REPOSITORY $TMP/ - cd $TMP/$PRGNAM/ + +[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git log -1 --format=%h_%ad --date=format:%Y.%m.%d)" || git checkout $VERSION + meson setup \ --prefix /usr \ --mandir /usr/man/ \ diff --git a/wayland/seatd/SlackBuild b/wayland/seatd/SlackBuild index 9ad0dea1..cccceb75 100755 --- a/wayland/seatd/SlackBuild +++ b/wayland/seatd/SlackBuild @@ -1,7 +1,7 @@ #!/bin/bash # variables -VERSION=master_$(date +"%Y.%m.%d_%H.%M") +VERSION=${VERSION:-"trunk"} BUILD=1 TAG=gwh @@ -26,11 +26,12 @@ mkdir -p $PKG [ ! -e $REPOSITORY ] && git clone https://git.sr.ht/~kennylevinsen/seatd $REPOSITORY cd $REPOSITORY git pull --all -VERSION="git_$( cd $REPOSITORY && git log -1 --format=%h_%ad --date=format:%Y.%m.%d )" cp -R $REPOSITORY $TMP/ - cd $TMP/$PRGNAM/ + +[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git log -1 --format=%h_%ad --date=format:%Y.%m.%d)" || git checkout $VERSION + meson setup --prefix /usr --mandir /usr/man/ build/ ninja -C build/ cd build/ diff --git a/wayland/sway/SlackBuild b/wayland/sway/SlackBuild index 0f118d61..68183f8a 100755 --- a/wayland/sway/SlackBuild +++ b/wayland/sway/SlackBuild @@ -1,7 +1,7 @@ #!/bin/bash # variables -VERSION=master_$(date +"%Y.%m.%d_%H.%M") +VERSION=${VERSION:-"trunk"} BUILD=1 TAG=gwh @@ -26,11 +26,12 @@ mkdir -p $PKG [ ! -e $REPOSITORY ] && git clone https://github.com/swaywm/sway $REPOSITORY cd $REPOSITORY git pull --all -VERSION="git_$( cd $REPOSITORY && git log -1 --format=%h_%ad --date=format:%Y.%m.%d )" cp -R $REPOSITORY $TMP/ - cd $TMP/$PRGNAM/ + +[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git log -1 --format=%h_%ad --date=format:%Y.%m.%d)" || git checkout $VERSION + meson setup \ --prefix /usr \ --mandir /usr/man/ \ diff --git a/wayland/swaybg/SlackBuild b/wayland/swaybg/SlackBuild index 03b0e369..004bbef0 100755 --- a/wayland/swaybg/SlackBuild +++ b/wayland/swaybg/SlackBuild @@ -1,7 +1,7 @@ #!/bin/bash # variables -VERSION=master_$(date +"%Y.%m.%d_%H.%M") +VERSION=${VERSION:-"trunk"} BUILD=1 TAG=gwh @@ -26,11 +26,12 @@ mkdir -p $PKG [ ! -e $REPOSITORY ] && git clone https://github.com/swaywm/swaybg $REPOSITORY cd $REPOSITORY git pull --all -VERSION="git_$( cd $REPOSITORY && git log -1 --format=%h_%ad --date=format:%Y.%m.%d )" cp -R $REPOSITORY $TMP/ - cd $TMP/$PRGNAM/ + +[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git log -1 --format=%h_%ad --date=format:%Y.%m.%d)" || git checkout $VERSION + meson setup --prefix /usr --mandir /usr/man/ build/ ninja -C build/ cd build/ diff --git a/wayland/swayidle/SlackBuild b/wayland/swayidle/SlackBuild index f0cdaea3..02ff1b69 100755 --- a/wayland/swayidle/SlackBuild +++ b/wayland/swayidle/SlackBuild @@ -1,7 +1,7 @@ #!/bin/bash # variables -VERSION=master_$(date +"%Y.%m.%d_%H.%M") +VERSION=${VERSION:-"trunk"} BUILD=1 TAG=gwh @@ -26,11 +26,12 @@ mkdir -p $PKG [ ! -e $REPOSITORY ] && git clone https://github.com/swaywm/swayidle $REPOSITORY cd $REPOSITORY git pull --all -VERSION="git_$( cd $REPOSITORY && git log -1 --format=%h_%ad --date=format:%Y.%m.%d )" cp -R $REPOSITORY $TMP/ - cd $TMP/$PRGNAM/ + +[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git log -1 --format=%h_%ad --date=format:%Y.%m.%d)" || git checkout $VERSION + meson setup --prefix /usr --mandir /usr/man/ build/ ninja -C build/ cd build/ diff --git a/wayland/swaylock/SlackBuild b/wayland/swaylock/SlackBuild index ec73f82c..4cb8877e 100755 --- a/wayland/swaylock/SlackBuild +++ b/wayland/swaylock/SlackBuild @@ -1,7 +1,7 @@ #!/bin/bash # variables -VERSION=master_$(date +"%Y.%m.%d_%H.%M") +VERSION=${VERSION:-"trunk"} BUILD=1 TAG=gwh @@ -26,11 +26,12 @@ mkdir -p $PKG [ ! -e $REPOSITORY ] && git clone https://github.com/swaywm/swaylock $REPOSITORY cd $REPOSITORY git pull --all -VERSION="git_$( cd $REPOSITORY && git log -1 --format=%h_%ad --date=format:%Y.%m.%d )" cp -R $REPOSITORY $TMP/ - cd $TMP/$PRGNAM/ + +[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git log -1 --format=%h_%ad --date=format:%Y.%m.%d)" || git checkout $VERSION + meson setup --prefix /usr --mandir /usr/man/ build/ ninja -C build/ cd build/ diff --git a/wayland/waybar/SlackBuild b/wayland/waybar/SlackBuild index 9515ae25..a8551c89 100755 --- a/wayland/waybar/SlackBuild +++ b/wayland/waybar/SlackBuild @@ -1,7 +1,7 @@ #!/bin/bash # variables -VERSION=master_$(date +"%Y.%m.%d_%H.%M") +VERSION=${VERSION:-"trunk"} BUILD=1 TAG=gwh @@ -26,11 +26,12 @@ mkdir -p $PKG [ ! -e $REPOSITORY ] && git clone https://github.com/Alexays/Waybar $REPOSITORY cd $REPOSITORY git pull --all -VERSION="git_$( cd $REPOSITORY && git log -1 --format=%h_%ad --date=format:%Y.%m.%d )" cp -R $REPOSITORY $TMP/ - cd $TMP/$PRGNAM/ + +[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git log -1 --format=%h_%ad --date=format:%Y.%m.%d)" || git checkout $VERSION + meson setup \ --prefix /usr \ --mandir /usr/man/ \ diff --git a/wayland/wlsunset/SlackBuild b/wayland/wlsunset/SlackBuild index b6b14262..10ba5d97 100755 --- a/wayland/wlsunset/SlackBuild +++ b/wayland/wlsunset/SlackBuild @@ -1,7 +1,7 @@ #!/bin/bash # variables -VERSION=master_$(date +"%Y.%m.%d_%H.%M") +VERSION=${VERSION:-"trunk"} BUILD=1 TAG=gwh @@ -26,11 +26,13 @@ mkdir -p $PKG [ ! -e $REPOSITORY ] && git clone https://git.sr.ht/~kennylevinsen/wlsunset $REPOSITORY cd $REPOSITORY git pull --all -VERSION="git_$( cd $REPOSITORY && git log -1 --format=%h_%ad --date=format:%Y.%m.%d )" cp -R $REPOSITORY $TMP/ cd $TMP/$PRGNAM/ + +[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git log -1 --format=%h_%ad --date=format:%Y.%m.%d)" || git checkout $VERSION + meson setup --prefix /usr --mandir /usr/man/ build/ ninja -C build/ cd build/ diff --git a/xap/alacritty/SlackBuild b/xap/alacritty/SlackBuild index 9eeeb675..a7b7c632 100755 --- a/xap/alacritty/SlackBuild +++ b/xap/alacritty/SlackBuild @@ -1,7 +1,7 @@ #!/bin/bash # variables -VERSION=${VERSION:-$(date +"%Y.%m.%d_%H.%M")} +VERSION=${VERSION:-"trunk"} BUILD=${BUILD:-1} TAG=gwh @@ -27,10 +27,10 @@ cd $TMP [ ! -e $REPOSITORY ] && git clone https://github.com/jwilm/alacritty.git $REPOSITORY cd $REPOSITORY git pull --all -VERSION="git_$( cd $REPOSITORY && git log -1 --format=%h_%ad --date=format:%Y.%m.%d )" cp -R $REPOSITORY $TMP/ cd $TMP/$PRGNAM +[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git log -1 --format=%h_%ad --date=format:%Y.%m.%d)" || git checkout $VERSION cargo build --release diff --git a/xap/alttab/SlackBuild b/xap/alttab/SlackBuild index 05b89a14..f9588dae 100755 --- a/xap/alttab/SlackBuild +++ b/xap/alttab/SlackBuild @@ -2,6 +2,7 @@ set -x PRGNAM=$(basename $(pwd)) +VERSION=${VERSION:-"trunk"} BUILD=1 @@ -27,12 +28,13 @@ rm -fr $PRGNAM $PKG [ ! -e $REPOSITORY ] && git clone https://github.com/sagb/alttab.git $REPOSITORY cd $REPOSITORY git pull --all -VERSION="git_$( cd $REPOSITORY && git log -1 --format=%h_%ad --date=format:%Y.%m.%d )" cp -R $REPOSITORY $TMP/$PRGNAM # Preparation cd $TMP/$PRGNAM +[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git log -1 --format=%h_%ad --date=format:%Y.%m.%d)" || git checkout $VERSION + chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ diff --git a/xap/brightnessctl/SlackBuild b/xap/brightnessctl/SlackBuild index d8bea85a..37acd49a 100755 --- a/xap/brightnessctl/SlackBuild +++ b/xap/brightnessctl/SlackBuild @@ -5,7 +5,7 @@ CWD=$(pwd) PRGNAM=$(basename $(pwd)) BRANCH= -VERSION=${VERSION:-$(date +"%Y.%m.%d_%H.%M")} +VERSION=${VERSION:-"trunk"} ARCH=${ARCH:-$(uname -m)} BUILD=1 @@ -19,11 +19,8 @@ REPOSITORIES=/home/installs/SlackBuilds/repositories PREFIX=/usr [ ! -e $REPOSITORIES/$PRGNAM ] && git clone https://github.com/Hummer12007/brightnessctl.git $REPOSITORIES/$PRGNAM -( cd $REPOSITORIES/$PRGNAM - git pull -) - -VERSION="git_$( cd $REPOSITORIES/$PRGNAM && git log -1 --format=%h_%ad --date=format:%Y.%m.%d )" +cd $REPOSITORIES/$PRGNAM +git pull --all # nettoyage préalable rm -fr $PKG $TMP/$PRGNAM @@ -35,6 +32,7 @@ cd $TMP cp -R $REPOSITORIES/$PRGNAM $TMP/$PRGNAM cd $TMP/$PRGNAM +[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git log -1 --format=%h_%ad --date=format:%Y.%m.%d)" || git checkout $VERSION # compilation make -j3 PREFIX=$PREFIX diff --git a/xap/i3status-rust/SlackBuild b/xap/i3status-rust/SlackBuild index 37c322b7..018a211b 100755 --- a/xap/i3status-rust/SlackBuild +++ b/xap/i3status-rust/SlackBuild @@ -1,7 +1,7 @@ #!/bin/bash # variables -VERSION=${VERSION:-$(date +"%Y.%m.%d_%H.%M")} +VERSION=${VERSION:-"trunk"} BUILD=${BUILD:-1} TAG=gwh @@ -27,10 +27,10 @@ cd $TMP [ ! -e $REPOSITORY ] && git clone https://github.com/greshake/i3status-rust.git $REPOSITORY cd $REPOSITORY git pull --all -VERSION="git_$( cd $REPOSITORY && git log -1 --format=%h_%ad --date=format:%Y.%m.%d )" cp -R $REPOSITORY $TMP/ cd $TMP/$PRGNAM +[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git log -1 --format=%h_%ad --date=format:%Y.%m.%d)" || git checkout $VERSION cargo build --release diff --git a/xap/image-roll/SlackBuild b/xap/image-roll/SlackBuild index efb8935a..aaa1e8e1 100755 --- a/xap/image-roll/SlackBuild +++ b/xap/image-roll/SlackBuild @@ -1,7 +1,7 @@ #!/bin/bash # variables -VERSION=${VERSION:-$(date +"%Y.%m.%d_%H.%M")} +VERSION=${VERSION:-"trunk"} BUILD=${BUILD:-1} TAG=gwh @@ -27,10 +27,10 @@ cd $TMP [ ! -e $REPOSITORY ] && git clone https://github.com/weclaw1/image-roll.git $REPOSITORY cd $REPOSITORY git pull --all -VERSION="git_$( cd $REPOSITORY && git log -1 --format=%h_%ad --date=format:%Y.%m.%d )" cp -R $REPOSITORY $TMP/ cd $TMP/$PRGNAM +[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git log -1 --format=%h_%ad --date=format:%Y.%m.%d)" || git checkout $VERSION cargo build --release diff --git a/xap/kitty/SlackBuild b/xap/kitty/SlackBuild index fc1b17fa..cae4c61c 100755 --- a/xap/kitty/SlackBuild +++ b/xap/kitty/SlackBuild @@ -7,11 +7,13 @@ CWD=$(pwd) OUTPUT=/tmp PRGNAM=$(basename $CWD) -PKG=$TMP/pkg-$PRGNAM +VERSION=${VERSION:-"trunk"} ARCH=$(uname -m) BUILD=1 +PKG=$TMP/pkg-$PRGNAM + PREFIX=/usr REPOSITORY=/home/installs/SlackBuilds/repositories/$PRGNAM @@ -25,10 +27,10 @@ mkdir -p $PKG [ ! -e $REPOSITORY ] && git clone https://github.com/kovidgoyal/kitty.git $REPOSITORY cd $REPOSITORY git pull --all -VERSION="git_$( cd $REPOSITORY && git log -1 --format=%h_%ad --date=format:%Y.%m.%d )" cp -R $REPOSITORY $TMP/$PRGNAM cd $TMP/$PRGNAM/ +[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git log -1 --format=%h_%ad --date=format:%Y.%m.%d)" || git checkout $VERSION # installation mkdir -p $PKG/ diff --git a/xap/leocad/SlackBuild b/xap/leocad/SlackBuild index c1ae6db5..3a3573cb 100755 --- a/xap/leocad/SlackBuild +++ b/xap/leocad/SlackBuild @@ -11,6 +11,7 @@ PKG=$TMP/pkg-$PRGNAM ARCH=$(uname -m) BUILD=1 +VERSION=${VERSION:-"trunk"} REPOSITORY=/home/installs/SlackBuilds/repositories/$PRGNAM @@ -23,10 +24,10 @@ mkdir -p $PKG [ ! -e $REPOSITORY ] && git clone https://github.com/leozide/leocad.git $REPOSITORY cd $REPOSITORY git pull --all -VERSION="git_$( cd $REPOSITORY && git log -1 --format=%h_%ad --date=format:%Y.%m.%d )" cp -R $REPOSITORY $TMP/$PRGNAM cd $TMP/$PRGNAM/ +[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git log -1 --format=%h_%ad --date=format:%Y.%m.%d)" || git checkout $VERSION qmake-qt5 DISABLE_UPDATE_CHECK=1 DOCS_DIR=/usr/doc/$PRGNAM MAN_DIR=/usr/man/man1 leocad.pro CFLAGS="$SLKCFLAGS" \ diff --git a/xap/nextcloud-client/SlackBuild b/xap/nextcloud-client/SlackBuild index 7564512b..e5396039 100755 --- a/xap/nextcloud-client/SlackBuild +++ b/xap/nextcloud-client/SlackBuild @@ -4,8 +4,7 @@ CWD=$(pwd) PRGNAM=$(basename $CWD) -VERSION=${VERSION:-$(date +"%Y.%m.%d_%H.%M")} -STABLE=${STABLE:-"NO"} +VERSION=${VERSION:-"trunk"} ARCH=${ARCH:-$(uname -m)} BUILD=1 @@ -27,22 +26,17 @@ mkdir -p $PKG # mise en place cd $TMP -if [ "x$STABLE" == "xYES" ]; then - wget -c https://download.owncloud.com/desktop/stable/$PRGNAM-$VERSION.tar.xz -O $CWD/$PRGNAM-$VERSION.tar.xz - tar xf $CWD/$PRGNAM-$VERSION.tar.xz -else - [ ! -e $REPOSITORY ] && git clone https://github.com/nextcloud/desktop.git $REPOSITORY +[ ! -e $REPOSITORY ] && git clone https://github.com/nextcloud/desktop.git $REPOSITORY - ( cd $REPOSITORY - git pull - git submodule update --init --recursive ) - - VERSION="git_$( cd $REPOSITORY && git log -1 --format=%h_%ad --date=format:%Y.%m.%d )" - cp -R $REPOSITORY $TMP/$PRGNAM-$VERSION -fi +cd $REPOSITORY +git pull --all +cp -R $REPOSITORY $TMP/$PRGNAM-$VERSION cd $TMP/$PRGNAM-$VERSION +[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git log -1 --format=%h_%ad --date=format:%Y.%m.%d)" || git checkout $VERSION +git submodule update --init --recursive + # configuration cmake \ -DCMAKE_INSTALL_PREFIX=$PREFIX \ diff --git a/xap/polybar/SlackBuild b/xap/polybar/SlackBuild index 46d2c0c3..6d17fcdd 100755 --- a/xap/polybar/SlackBuild +++ b/xap/polybar/SlackBuild @@ -1,7 +1,7 @@ #!/bin/bash # variables -VERSION=${VERSION:-$(date +"%Y.%m.%d_%H.%M")} +VERSION=${VERSION:-"trunk"} BUILD=${BUILD:-1} TAG=gwh @@ -27,10 +27,12 @@ cd $TMP [ ! -e $REPOSITORY ] && git clone https://github.com/polybar/polybar.git $REPOSITORY cd $REPOSITORY git pull --all -VERSION="git_$( cd $REPOSITORY && git log -1 --format=%h_%ad --date=format:%Y.%m.%d )" cp -R $REPOSITORY $TMP/ cd $TMP/$PRGNAM + +[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git log -1 --format=%h_%ad --date=format:%Y.%m.%d)" || git checkout $VERSION + git submodule init git submodule update diff --git a/xap/radeon-profile/SlackBuild b/xap/radeon-profile/SlackBuild index f98042b2..d1aebd1d 100755 --- a/xap/radeon-profile/SlackBuild +++ b/xap/radeon-profile/SlackBuild @@ -11,6 +11,7 @@ PKG=$TMP/pkg-$PRGNAM ARCH=$(uname -m) BUILD=1 +VERSION=${VERSION:-"trunk"} REPOSITORY=/home/installs/SlackBuilds/repositories/$PRGNAM @@ -23,10 +24,10 @@ mkdir -p $PKG [ ! -e $REPOSITORY ] && git clone https://github.com/marazmista/radeon-profile.git $REPOSITORY cd $REPOSITORY git pull --all -VERSION="git_$( cd $REPOSITORY && git log -1 --format=%h_%ad --date=format:%Y.%m.%d )" cp -R $REPOSITORY $TMP/$PRGNAM cd $TMP/$PRGNAM/$PRGNAM/ +[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git log -1 --format=%h_%ad --date=format:%Y.%m.%d)" || git checkout $VERSION qmake-qt5 DISABLE_UPDATE_CHECK=1 DOCS_DIR=/usr/doc/$PRGNAM MAN_DIR=/usr/man/man1 CFLAGS="$SLKCFLAGS" \ diff --git a/xap/rkvm/SlackBuild b/xap/rkvm/SlackBuild index c63f70a6..f1129cc3 100755 --- a/xap/rkvm/SlackBuild +++ b/xap/rkvm/SlackBuild @@ -1,7 +1,7 @@ #!/bin/bash # variables -VERSION=${VERSION:-$(date +"%Y.%m.%d_%H.%M")} +VERSION=${VERSION:-"trunk"} BUILD=${BUILD:-1} TAG=gwh @@ -27,10 +27,10 @@ cd $TMP [ ! -e $REPOSITORY ] && git clone https://github.com/htrefil/rkvm.git $REPOSITORY cd $REPOSITORY git pull --all -VERSION="git_$( cd $REPOSITORY && git log -1 --format=%h_%ad --date=format:%Y.%m.%d )" cp -R $REPOSITORY $TMP/ cd $TMP/$PRGNAM +[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git log -1 --format=%h_%ad --date=format:%Y.%m.%d)" || git checkout $VERSION cargo build --release diff --git a/xap/wezterm/SlackBuild b/xap/wezterm/SlackBuild index 09daeb22..3f27fcdd 100755 --- a/xap/wezterm/SlackBuild +++ b/xap/wezterm/SlackBuild @@ -1,7 +1,7 @@ #!/bin/bash # variables -VERSION=${VERSION:-$(date +"%Y.%m.%d_%H.%M")} +VERSION=${VERSION:-"trunk"} BUILD=${BUILD:-1} TAG=gwh @@ -27,11 +27,12 @@ cd $TMP [ ! -e $REPOSITORY ] && git clone https://github.com/wez/wezterm.git $REPOSITORY cd $REPOSITORY git pull --all -VERSION="git_$( cd $REPOSITORY && git log -1 --format=%h_%ad --date=format:%Y.%m.%d )" cp -R $REPOSITORY $TMP/ cd $TMP/$PRGNAM +[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git log -1 --format=%h_%ad --date=format:%Y.%m.%d)" || git checkout $VERSION + cargo build --release mkdir -p $PKG$PREFIX/bin diff --git a/xap/x48/SlackBuild b/xap/x48/SlackBuild index c03438f7..1183827c 100755 --- a/xap/x48/SlackBuild +++ b/xap/x48/SlackBuild @@ -2,9 +2,9 @@ set -x PRGNAM=x48 -VERSION=${VERSION:-0.6.4} BUILD=1 +VERSION=${VERSION:-"trunk"} ARCH=$(uname -m) LIBSUFFIX=$(echo $ARCH | grep -o "\(64\)") @@ -28,12 +28,14 @@ rm -fr $PRGNAM $PKG [ ! -e $REPOSITORY ] && git clone https://github.com/gwenhael-le-moine/x48.git $REPOSITORY cd $REPOSITORY git pull --all -VERSION="git_$( cd $REPOSITORY && git log -1 --format=%h_%ad --date=format:%Y.%m.%d )" cp -R $REPOSITORY $TMP/$PRGNAM # Preparation cd $TMP/$PRGNAM + +[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git log -1 --format=%h_%ad --date=format:%Y.%m.%d)" || git checkout $VERSION + chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ diff --git a/xap/x49gp/SlackBuild b/xap/x49gp/SlackBuild index 653a7bdb..59dc1eda 100755 --- a/xap/x49gp/SlackBuild +++ b/xap/x49gp/SlackBuild @@ -4,7 +4,7 @@ set -x CWD=$(pwd) PRGNAM=$(basename $CWD) -VERSION=${VERSION:-$(date +%F | tr - .)} +VERSION=${VERSION:-"trunk"} BUILD=1 @@ -29,11 +29,12 @@ rm -fr $TMP/$PRGNAM $PKG [ ! -e $REPOSITORY ] && git clone https://github.com/gwenhael-le-moine/x49gp.git $REPOSITORY cd $REPOSITORY git pull --all -VERSION="git_$( cd $REPOSITORY && git log -1 --format=%h_%ad --date=format:%Y.%m.%d )" + cp -R $REPOSITORY $TMP/$PRGNAM +cd $TMP/$PRGNAM +[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git log -1 --format=%h_%ad --date=format:%Y.%m.%d)" || git checkout $VERSION # Preparation -cd $TMP/$PRGNAM chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ diff --git a/y/cboard/SlackBuild b/y/cboard/SlackBuild index b7a104f8..5ce9183f 100755 --- a/y/cboard/SlackBuild +++ b/y/cboard/SlackBuild @@ -6,6 +6,7 @@ CWD=$(pwd) PRGNAM=$(basename $CWD) BUILD=1 +VERSION=${VERSION:-"trunk"} ARCH=$(uname -m) LIBSUFFIX=$(echo $ARCH | grep -o "\(64\)") @@ -27,11 +28,13 @@ mkdir -p $TMP [ ! -e $REPOSITORY ] && git clone "http://repo.or.cz/r/cboard.git" $REPOSITORY cd $REPOSITORY git pull --all -VERSION="git_$( cd $REPOSITORY && git log -1 --format=%h_%ad --date=format:%Y.%m.%d )" # Preparation cp -R $REPOSITORY $TMP/$PRGNAM-$VERSION cd $TMP/$PRGNAM-$VERSION + +[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git log -1 --format=%h_%ad --date=format:%Y.%m.%d)" || git checkout $VERSION + chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ diff --git a/y/steamtinkerlaunch/SlackBuild b/y/steamtinkerlaunch/SlackBuild index 2129fb3b..25a3ee4c 100755 --- a/y/steamtinkerlaunch/SlackBuild +++ b/y/steamtinkerlaunch/SlackBuild @@ -11,6 +11,7 @@ PKG=$TMP/pkg-$PRGNAM ARCH=$(uname -m) BUILD=1 +VERSION=${VERSION:-"trunk"} REPOSITORY=/home/installs/SlackBuilds/repositories/$PRGNAM @@ -23,10 +24,10 @@ mkdir -p $PKG [ ! -e $REPOSITORY ] && git clone https://github.com/frostworx/steamtinkerlaunch.git $REPOSITORY cd $REPOSITORY git pull --all -VERSION="git_$( cd $REPOSITORY && git log -1 --format=%h_%ad --date=format:%Y.%m.%d )" cp -R $REPOSITORY $TMP/$PRGNAM cd $TMP/$PRGNAM/ +[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git log -1 --format=%h_%ad --date=format:%Y.%m.%d)" || git checkout $VERSION make PREFIX="$PKG/usr" install