From ef58d375eb4a3ab2107e24ec2565e6a65b1e50e5 Mon Sep 17 00:00:00 2001 From: binhex Date: Wed, 13 Oct 2021 10:36:57 +0100 Subject: [PATCH] put in arg for release tag name --- build/root/install.sh | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/build/root/install.sh b/build/root/install.sh index e5078e7..20235c2 100644 --- a/build/root/install.sh +++ b/build/root/install.sh @@ -3,6 +3,9 @@ # exit script if return code != 0 set -e +# release tag name from build arg, stripped of build ver using string manipulation +release_tag_name="${1//-[0-9][0-9]/}" + # note do NOT download build scripts - inherited from int script with envvars common defined # detect image arch @@ -50,9 +53,9 @@ source aur.sh # custom #### -# this is a (temporary?) hack to prevent the error '/usr/bin/qbittorrent-nox: -# error while loading shared libraries: libQt5Core.so.5: cannot open shared -# object file: No such file or directory.' when running this container on +# this is a (temporary?) hack to prevent the error '/usr/bin/qbittorrent-nox: +# error while loading shared libraries: libQt5Core.so.5: cannot open shared +# object file: No such file or directory.' when running this container on # hosts with older kernels (centos, mac os). alternative workaround to this # is for the user to upgrade the kernel on their host. pacman -S binutils --needed --noconfirm @@ -61,7 +64,7 @@ strip --remove-section=.note.ABI-tag /usr/lib64/libQt5Core.so.5 # container perms #### -# define comma separated list of paths +# define comma separated list of paths install_paths="/etc/privoxy,/home/nobody" # split comma separated string into list for install paths @@ -91,7 +94,7 @@ cat < /tmp/permissions_heredoc previous_puid=\$(cat "/root/puid" 2>/dev/null || true) previous_pgid=\$(cat "/root/pgid" 2>/dev/null || true) -# if first run (no puid or pgid files in /tmp) or the PUID or PGID env vars are different +# if first run (no puid or pgid files in /tmp) or the PUID or PGID env vars are different # from the previous run then re-apply chown with current PUID and PGID values. if [[ ! -f "/root/puid" || ! -f "/root/pgid" || "\${previous_puid}" != "\${PUID}" || "\${previous_pgid}" != "\${PGID}" ]]; then