aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2024-01-25 06:38:49 +0000
committerSam James <sam@gentoo.org>2024-01-25 06:38:49 +0000
commit8decee79189da859238c734a0851ad4121aa1abd (patch)
tree45d0fb705b9123cf7a320dbaec7211199d2f5cce
parentsign-autobuilds: link signatures (diff)
downloadmastermirror-scripts-8decee79189da859238c734a0851ad4121aa1abd.tar.gz
mastermirror-scripts-8decee79189da859238c734a0851ad4121aa1abd.tar.bz2
mastermirror-scripts-8decee79189da859238c734a0851ad4121aa1abd.zip
rsync-gen.sh: do not use non-portable `which`20240125T063921Z
Use `command -v` instead. We're hoping to remove which from @system. Signed-off-by: Sam James <sam@gentoo.org>
-rwxr-xr-xrsync-gen.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/rsync-gen.sh b/rsync-gen.sh
index 1335dab..82e72b9 100755
--- a/rsync-gen.sh
+++ b/rsync-gen.sh
@@ -60,14 +60,14 @@ RSYNC_GIT_EXCLUDE="--include core/ --include '*.old' --cvs-exclude --exclude=.gi
[[ -d ${LOGDIR} ]] || mkdir ${LOGDIR}
[[ -d ${BASE}/tmp ]] || mkdir ${BASE}/tmp
TIMESLOG="${LOGDIR}/rsync-gen-times.log"
-for atomic_rsync in `which atomic-rsync 2>/dev/null` /usr/share/rsync/atomic-rsync MISSING ; do
+for atomic_rsync in `command -v atomic-rsync 2>/dev/null` /usr/share/rsync/atomic-rsync MISSING ; do
[ -x $atomic_rsync ] && break
done
if [ "$atomic_rsync" == "MISSING" ]; then
echo "$0: Cannot do final atomic rsync into place, atomic-rsync tool is missing"
exit 1
fi
-for gemato in `which gemato 2>/dev/null` /usr/local/bin/gemato/bin/gemato MISSING ; do
+for gemato in `command -v gemato 2>/dev/null` /usr/local/bin/gemato/bin/gemato MISSING ; do
[ -x $gemato ] && break
done
if [ "$gemato " == "MISSING" ]; then