matir/skel
1
0
Fork 0
mirror of https://github.com/Matir/skel.git synced 2026-05-26 13:35:42 -07:00
Code Issues Packages Projects Releases Wiki Activity

Simplify preference variables.

Browse Source
This commit is contained in:
David Tomaschik
2019-11-12 16:54:12 -08:00
parent b8607f4bdc
commit 2419693164
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
install.sh
View File

@@ -302,7 +302,8 @@ save_prefs() {
echo_pref() { echo_pref() {
eval "local val=\${$1}" eval "local val=\${$1}"
echo "$1=\${$1:-${val}}" # shellcheck disable=SC2154
echo ": \${$1:=${val}}"
} }
cleanup() { cleanup() {
@@ -361,13 +362,13 @@ read_saved_prefs
# Defaults if not passed in or saved. # Defaults if not passed in or saved.
# TODO: use flags instead of environment variables. # TODO: use flags instead of environment variables.
BASEDIR=${BASEDIR:-$HOME/.skel} : ${BASEDIR:=$HOME/.skel}
MINIMAL=${MINIMAL:-0} : ${MINIMAL:=0}
INSTALL_KEYS=${INSTALL_KEYS:-1} : ${INSTALL_KEYS:=1}
TRUST_ALL_KEYS=${TRUST_ALL_KEYS:-0} : ${TRUST_ALL_KEYS:=0}
INSTALL_PKGS=${INSTALL_PKGS:-0} : ${INSTALL_PKGS:=0}
VERBOSE=${VERBOSE:-0} : ${VERBOSE:=0}
SAVE=${SAVE:-1} : ${SAVE:=1}
# Check prerequisites # Check prerequisites
if [ ! -d $BASEDIR ] ; then if [ ! -d $BASEDIR ] ; then