h3xx/you-dont-need-pihole
1
0
Fork 0
mirror of https://codeberg.org/h3xx/you-dont-need-pihole.git synced 2024-08-14 20:27:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove 'set -e'

Browse source 
Makes scripts less able to handle errors properly.
This commit is contained in:
Dan Church 2023-07-11 12:54:22 -05:00
parent 06e9f59489
commit 942465cc22
Signed by: h3xx
GPG key ID: EA2BF379CD2CDBD0
1 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
update.sh
View file

@ -13,8 +13,6 @@
# You may NOT use this software for commercial purposes. # You may NOT use this software for commercial purposes.
############################################################################### ###############################################################################
set -e
WORKDIR=${0%/*} WORKDIR=${0%/*}
CFG=$WORKDIR/update.cfg CFG=$WORKDIR/update.cfg
@ -26,7 +24,7 @@ OUT=()
URL=() URL=()
DNSMASQ_RESTART_COMMAND=() DNSMASQ_RESTART_COMMAND=()
if [[ -f $CFG ]]; then if [[ -f $CFG ]]; then
. "$CFG" . "$CFG" || exit
fi fi
TEMP_DIR=$(mktemp -d -t "${0##*/}.XXXXXX") TEMP_DIR=$(mktemp -d -t "${0##*/}.XXXXXX")
@ -37,9 +35,9 @@ trap 'cleanup' EXIT
copy_perms() { copy_perms() {
local -r FROM=$1 TO=$2 local -r FROM=$1 TO=$2
chmod --reference="$FROM" -- "$TO" chmod --reference="$FROM" -- "$TO" || exit
if [[ $UID -eq 0 ]]; then if [[ $UID -eq 0 ]]; then
chown --reference="$FROM" -- "$TO" chown --reference="$FROM" -- "$TO" || exit
fi fi
} }
@ -50,12 +48,12 @@ replace_with() {
if [[ -f $ORIG ]]; then if [[ -f $ORIG ]]; then
copy_perms "$ORIG" "$NEW" copy_perms "$ORIG" "$NEW"
if [[ -n $BACKUPSUFFIX ]]; then if [[ -n $BACKUPSUFFIX ]]; then
mv -- "$ORIG" "$ORIG$BACKUPSUFFIX" mv -- "$ORIG" "$ORIG$BACKUPSUFFIX" || exit
fi fi
else else
mkdir -p -- "${ORIG%/*}" mkdir -p -- "${ORIG%/*}" || exit
fi fi
mv -- "$NEW" "$ORIG" mv -- "$NEW" "$ORIG" || exit
else else
printf 'File "%s" not modified\n' \ printf 'File "%s" not modified\n' \
"$ORIG" \ "$ORIG" \
@ -66,7 +64,7 @@ replace_with() {
(cd "$WORKDIR" && (cd "$WORKDIR" &&
git submodule update --init 'repos-noupdates/*' && git submodule update --init 'repos-noupdates/*' &&
git submodule update --init --remote 'repos/*' git submodule update --init --remote 'repos/*'
) ) || exit
for (( I = 0 ; I < ${#OUT[@]} ; ++I )); do for (( I = 0 ; I < ${#OUT[@]} ; ++I )); do
MY_URL=${URL[$I]} MY_URL=${URL[$I]}
@ -84,13 +82,13 @@ for (( I = 0 ; I < ${#OUT[@]} ; ++I )); do
wget \ wget \
-O "$TEMP_OUT" \ -O "$TEMP_OUT" \
"$MY_URL" "$MY_URL" || exit
replace_with "$MY_OUT" "$TEMP_OUT" replace_with "$MY_OUT" "$TEMP_OUT"
done done
TEMP_BLOCKLIST=$(mktemp -p "$TEMP_DIR") TEMP_BLOCKLIST=$(mktemp -p "$TEMP_DIR")
"$WORKDIR/make-block.pl" --out="$TEMP_BLOCKLIST" "$WORKDIR/make-block.pl" --out="$TEMP_BLOCKLIST" || exit
# Blocklist generation succeeded, install it! # Blocklist generation succeeded, install it!
@ -102,11 +100,11 @@ if [[ ! -e $BLOCKLIST ]]; then
# whatever file permissions 'mktemp' sets. # whatever file permissions 'mktemp' sets.
umask 0022 umask 0022
touch -- "$BLOCKLIST" touch -- "$BLOCKLIST"
) ) || exit
fi fi
replace_with "$BLOCKLIST" "$TEMP_BLOCKLIST" replace_with "$BLOCKLIST" "$TEMP_BLOCKLIST"
if [[ ${#DNSMASQ_RESTART_COMMAND[@]} -gt 0 ]]; then if [[ ${#DNSMASQ_RESTART_COMMAND[@]} -gt 0 ]]; then
"${DNSMASQ_RESTART_COMMAND[@]}" "${DNSMASQ_RESTART_COMMAND[@]}" || exit
fi fi