scripts/rsync-generation/mksnapshot: shellcheck

Signed-off-by: Fabian Groffen <grobian@gentoo.org>

1 files changed, 39 insertions, 49 deletions

diff --git a/scripts/rsync-generation/mksnapshot.sh b/scripts/rsync-generation/mksnapshot.sh
index e4db893b64..7879adc353 100755
--- a/scripts/rsync-generation/mksnapshot.sh
+++ b/scripts/rsync-generation/mksnapshot.sh
@@ -25,71 +25,61 @@ if [[ ! -s "${BOOTSTRAP_SNAPSHOT}" ]] ; then
 	curl -s -L "https://distfiles.prefix.bitzolder.nl/prefix/distfiles/${BOOTSTRAP_SNAPSHOT}" > "${BOOTSTRAP_SNAPSHOT}"
 fi
 
-rm -Rf ${TMPDIR}
-mkdir -p ${TMPDIR}
+rm -Rf "${TMPDIR}"
+mkdir -p "${TMPDIR}"
 
 # quickly take a snapshot, such that we get a consistent image
-pushd ${RSYNCTREE} > /dev/null
-tar -cf ${SNAME} --exclude=snapshots * || exit 1
+pushd "${RSYNCTREE}" > /dev/null || exit 1
+tar -cf "${SNAME}" --exclude=snapshots -- * || exit 1
 popd > /dev/null
 
 # now revamp it such that it's in a directory "portage"
-rm -Rf ${TMPDIR}
-mkdir -p ${TMPDIR}
-pushd ${TMPDIR} > /dev/null
+rm -Rf "${TMPDIR}"
+mkdir -p "${TMPDIR}"
+pushd "${TMPDIR}" > /dev/null || exit 1
 mkdir portage
-tar -xf ${SNAME} -C portage/
-tar --numeric-owner --format=posix --hard-dereference -cf ${SNAME} portage/
+tar -xf "${SNAME}" -C portage/
+tar --numeric-owner --format=posix --hard-dereference -cf "${SNAME}" portage/
 popd > /dev/null
 
-rm -Rf ${TMPDIR}
+rm -Rf "${TMPDIR}"
 
 # be nice
-nice -n19 bzip2 -c -9 ${SNAME} > ${SNAME}.bz2 &
-nice -n19 xz -c -9 ${SNAME} > ${SNAME}.xz &
-nice -n19 gzip -c -9 ${SNAME} > ${SNAME}.gz &
+nice -n19 bzip2 -c -9 "${SNAME}" > "${SNAME}".bz2 &
+nice -n19 xz    -c -9 "${SNAME}" > "${SNAME}".xz  &
+nice -n19 gzip  -c -9 "${SNAME}" > "${SNAME}".gz  &
 wait
 
 # generate accompanying meta files
-md5sum ${SNAME##*/}      > ${SNAME}.xz.umd5sum
-md5sum ${SNAME##*/}.xz   > ${SNAME}.xz.md5sum
-md5sum ${SNAME##*/}      > ${SNAME}.bz2.umd5sum
-md5sum ${SNAME##*/}.bz2  > ${SNAME}.bz2.md5sum
-md5sum ${SNAME##*/}      > ${SNAME}.gz.umd5sum
-md5sum ${SNAME##*/}.bz2  > ${SNAME}.gz.md5sum
-# gpg is really stupid, or I am too stupid to find the right option
-gpgopts="--quiet --batch --no-tty --passphrase-fd 0 --pinentry-mode loopback"
-gpgopts+=" --default-key C6317B3C --detach-sign --armor"
-gpg ${gpgopts} -o ${SNAME}.xz.gpgsig ${SNAME}.xz < ${SCRIPTLOC}/autosigner.pwd
-gpg ${gpgopts} -o ${SNAME}.bz2.gpgsig ${SNAME}.bz2 < ${SCRIPTLOC}/autosigner.pwd
-gpg ${gpgopts} -o ${SNAME}.gz.gpgsig ${SNAME}.gz < ${SCRIPTLOC}/autosigner.pwd
+md5sum "${SNAME##*/}"      > "${SNAME}".xz.umd5sum
+md5sum "${SNAME##*/}".xz   > "${SNAME}".xz.md5sum
+md5sum "${SNAME##*/}"      > "${SNAME}".bz2.umd5sum
+md5sum "${SNAME##*/}".bz2  > "${SNAME}".bz2.md5sum
+md5sum "${SNAME##*/}"      > "${SNAME}".gz.umd5sum
+md5sum "${SNAME##*/}".bz2  > "${SNAME}".gz.md5sum
+# use passphrase-fd to pass password
+gpgopts=(
+	"--quiet"
+	"--batch"
+	"--no-tty"
+	"--passphrase-fd" 0
+	"--pinentry-mode" "loopback"
+	"--default-key" "C6317B3C"
+	"--detach-sign"
+	"--armor"
+)
+gpg "${gpgopts[@]}" -o "${SNAME}".xz.gpgsig  "${SNAME}".xz  \
+	< "${SCRIPTLOC}"/autosigner.pwd
+gpg "${gpgopts[@]}" -o "${SNAME}".bz2.gpgsig "${SNAME}".bz2 \
+	< "${SCRIPTLOC}"/autosigner.pwd
+gpg "${gpgopts[@]}" -o "${SNAME}".gz.gpgsig  "${SNAME}".gz  \
+	< "${SCRIPTLOC}"/autosigner.pwd
 
 # we no longer need the tar
-rm ${SNAME}
+rm "${SNAME}"
 
 # make convenience symlinks
 for f in {xz,bz2,gz}{,.gpgsig,.md5sum,.umd5sum} ; do
-	rm portage-latest.tar.$f
-	ln -s ${SNAME##*/}.$f portage-latest.tar.$f
+	rm "portage-latest.tar.$f"
+	ln -s "${SNAME##*/}.$f" "portage-latest.tar.$f"
 done
-
-# darkside's delta code
-
-# FAILS and nobody cares!
-
-#YESTERDAY=$(date +%Y%m%d -d @${YESTERDAY})
-#TODAY=$(date +%Y%m%d -d @${TODAY})
-#cp portage-{${YESTERDAY},${TODAY}}.tar.bz2 /dev/shm/
-#SNAP_DIR=${PWD}
-#
-#cd /dev/shm
-#bunzip2 portage*
-#
-#differ -f bdelta portage-{${YESTERDAY},${TODAY}}.tar \
-#    ${SNAP_DIR}/deltas/snapshot-${YESTERDAY}-${TODAY}.patch
-#
-#bzip2 "${SNAP_DIR}/deltas/snapshot-${YESTERDAY}-${TODAY}.patch"
-#
-#rm -f portage* snapshot*
-
-# FAILS and nobody cares