mirror of
https://github.com/ivuorinen/dotfiles.git
synced 2026-02-09 23:47:15 +00:00
fix(scripts): fix shared.sh guard logic and echo -e portability
- shared.sh: simplify guard logic, remove misleading warning message,
use ${VAR:-} pattern to avoid unbound variable error
- install-cheat-purebashbible.sh: replace echo -e with printf for
POSIX portability
This commit is contained in:
@@ -86,7 +86,7 @@ process_chapters()
|
|||||||
if [ '---' != "$(head -1 < "$cheat_file")" ]; then
|
if [ '---' != "$(head -1 < "$cheat_file")" ]; then
|
||||||
local metadata
|
local metadata
|
||||||
metadata="$PBB_SYNTAX\n$PBB_TAGS\n$PBB_SOURCE\n"
|
metadata="$PBB_SYNTAX\n$PBB_TAGS\n$PBB_SOURCE\n"
|
||||||
echo -e "---\n$metadata---\n$(cat "$cheat_file")" > "$cheat_file"
|
printf '%s\n%b%s\n%s' "---" "$metadata" "---" "$(cat "$cheat_file")" > "$cheat_file"
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,17 +4,8 @@
|
|||||||
# Helper env variables. Use like this: VERBOSE=1 ./script.sh
|
# Helper env variables. Use like this: VERBOSE=1 ./script.sh
|
||||||
: "${VERBOSE:=0}"
|
: "${VERBOSE:=0}"
|
||||||
|
|
||||||
# Set variable that checks if the shared.sh script has been
|
# Source the main shared config if not already loaded
|
||||||
# sourced only once If the script has been sourced more than once,
|
if [ -z "${SHARED_SCRIPTS_SOURCED:-}" ]; then
|
||||||
# the script not be sourced again.
|
|
||||||
[ -z "$SHARED_SCRIPTS_SOURCED" ] && {
|
|
||||||
|
|
||||||
source "${DOTFILES}/config/shared.sh"
|
source "${DOTFILES}/config/shared.sh"
|
||||||
# Warn the user if the shared configuration hasn't been loaded yet
|
|
||||||
msgr warn "(!) shared.sh not sourced"
|
|
||||||
|
|
||||||
# Set variable that checks if the shared.sh script has been
|
|
||||||
# sourced only once.
|
|
||||||
# shellcheck disable=SC2034
|
|
||||||
export SHARED_SCRIPTS_SOURCED=1
|
export SHARED_SCRIPTS_SOURCED=1
|
||||||
}
|
fi
|
||||||
|
|||||||
Reference in New Issue
Block a user