feat(packaging: bin-wrappers; pkgbuild): allow overriding SCREENLAYOU…

…T_SCRIPT and CACHEDIR env vars in .profile
actionless · Dec 15, 2024 · 978ee70 · 978ee70
1 parent 2efda20
commit 978ee70
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/PKGBUILD b/PKGBUILD
@@ -10,7 +10,7 @@ INSTALL_NO_ARGB_SHORTCUTS=${NOARGB:-n}
 pkgname=actionless_awesome_config_meta
 conflicts=(awesome_config_actionless_meta)
 pkgver=0.5
-pkgrel=10
+pkgrel=11
 pkgdesc="Awesome config dependencies"
 arch=('any')
 url="https://github.com/actionless/awesome_config"

diff --git a/packaging/awesome_argb b/packaging/awesome_argb
@@ -1,17 +1,18 @@
 #!/bin/bash
 
+SCREENLAYOUT_SCRIPT=~/.screenlayout/default.sh
+CACHEDIR="$HOME"/.cache
 PROFILE_FILE=$HOME/.profile
+
 if test -f "$PROFILE_FILE" ; then
 	# shellcheck disable=SC1090
 	. "$PROFILE_FILE"
 fi
 
-SCREENLAYOUT_SCRIPT=~/.screenlayout/default.sh
 if test -f "$SCREENLAYOUT_SCRIPT" ; then
     "$SCREENLAYOUT_SCRIPT"
 fi
 
-CACHEDIR="$HOME"/.cache
 if test ! -d "${CACHEDIR}" ; then
     mkdir -p "${CACHEDIR}"
 fi

diff --git a/packaging/awesome_composite b/packaging/awesome_composite
@@ -1,17 +1,18 @@
 #!/bin/bash
 
+SCREENLAYOUT_SCRIPT=~/.screenlayout/default.sh
+CACHEDIR="$HOME"/.cache
 PROFILE_FILE=$HOME/.profile
+
 if test -f "$PROFILE_FILE" ; then
 	# shellcheck disable=SC1090
 	. "$PROFILE_FILE"
 fi
 
-SCREENLAYOUT_SCRIPT=~/.screenlayout/default.sh
 if test -f "$SCREENLAYOUT_SCRIPT" ; then
-	"$SCREENLAYOUT_SCRIPT"
+    "$SCREENLAYOUT_SCRIPT"
 fi
 
-CACHEDIR="$HOME"/.cache
 if test ! -d "${CACHEDIR}" ; then
     mkdir -p "${CACHEDIR}"
 fi

diff --git a/packaging/awesome_no_argb b/packaging/awesome_no_argb
@@ -1,17 +1,18 @@
 #!/bin/bash
 
+SCREENLAYOUT_SCRIPT=~/.screenlayout/default.sh
+CACHEDIR="$HOME"/.cache
 PROFILE_FILE=$HOME/.profile
+
 if test -f "$PROFILE_FILE" ; then
 	# shellcheck disable=SC1090
 	. "$PROFILE_FILE"
 fi
 
-SCREENLAYOUT_SCRIPT=~/.screenlayout/default.sh
 if test -f "$SCREENLAYOUT_SCRIPT" ; then
     "$SCREENLAYOUT_SCRIPT"
 fi
 
-CACHEDIR="$HOME"/.cache
 if test ! -d "${CACHEDIR}" ; then
     mkdir -p "${CACHEDIR}"
 fi