aboutsummaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorPaul Spooren <mail@aparcar.org>2020-08-09 15:33:37 -1000
committerAdrian Schmutzler <freifunk@adrianschmutzler.de>2020-08-12 11:08:05 +0200
commit1fdf6b745cc3d85be3743837817a360121554134 (patch)
tree6396426c1b63ceb0b21c486a3158ded303eebe3e /scripts
parent4165232c45df224f32a94f43b9938d13d643b2a8 (diff)
downloadupstream-1fdf6b745cc3d85be3743837817a360121554134.tar.gz
upstream-1fdf6b745cc3d85be3743837817a360121554134.tar.bz2
upstream-1fdf6b745cc3d85be3743837817a360121554134.zip
treewide: replace `which` with `command -v`
Fix shellcheck SC2230 > which is non-standard. Use builtin 'command -v' instead. Using `command -v` is POSIX compliant while `which` is not. Also to mention, `command -v` is a shell builtin whereas `which` is a separate busybox applet. Once applied to everything concerning OpenWrt we can disable the busybox feature `which` and save 3.8kB. Acked-by: Stijn Tintel <stijn@linux-ipv6.be> Signed-off-by: Paul Spooren <mail@aparcar.org> [also replace cases in zram-swap] Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/ipkg-build12
1 files changed, 6 insertions, 6 deletions
diff --git a/scripts/ipkg-build b/scripts/ipkg-build
index 21127f3391..6e027bc546 100755
--- a/scripts/ipkg-build
+++ b/scripts/ipkg-build
@@ -10,10 +10,10 @@
set -e
version=1.0
-FIND="$(which find)"
-FIND="${FIND:-$(which gfind)}"
-TAR="${TAR:-$(which tar)}"
-GZIP="$(which gzip)"
+FIND="$(command -v find)"
+FIND="${FIND:-$(command -v gfind)}"
+TAR="${TAR:-$(command -v tar)}"
+GZIP="$(command -v gzip)"
# try to use fixed source epoch
if [ -n "$SOURCE_DATE_EPOCH" ]; then
@@ -21,10 +21,10 @@ if [ -n "$SOURCE_DATE_EPOCH" ]; then
# look up date of last commit
elif [ -d "$TOPDIR/.git" ]; then
- GIT="$(which git)"
+ GIT="$(command -v git)"
TIMESTAMP=$(cd $TOPDIR; $GIT log -1 -s --format=%ci)
elif [ -d "$TOPDIR/.svn" ]; then
- SVN="$(which svn)"
+ SVN="$(command -v svn)"
TIMESTAMP=$($SVN info "$TOPDIR" | sed -n "s/^Last Changed Date: \(.*\)/\1/p")
else
TIMESTAMP=$(date)