Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/npm/cli.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorisaacs <i@izs.me>2011-10-31 19:25:20 +0400
committerisaacs <i@izs.me>2011-10-31 19:25:20 +0400
commitd65cd8a4478c4491379a94b8d70e82b2f0d84269 (patch)
tree16dd87970a05af5edde1bc7872d485e2b7f12ee9 /scripts
parent13d148eed2c7d580739ec15f9b222f354777468d (diff)
Print tar --version even if explicitly set
Diffstat (limited to 'scripts')
-rw-r--r--scripts/install.sh26
1 files changed, 14 insertions, 12 deletions
diff --git a/scripts/install.sh b/scripts/install.sh
index eb9c4ea98..3571e7bb5 100644
--- a/scripts/install.sh
+++ b/scripts/install.sh
@@ -72,27 +72,29 @@ fi
BACK="$PWD"
+ret=0
tar="${TAR}"
if [ -z "$tar" ]; then
tar=`which tar 2>&1`
ret=$?
+fi
- if [ $ret -eq 0 ] && [ -x "$tar" ]; then
- echo "tar=$tar"
- echo "version:"
- $tar --version
- ret=$?
- fi
+if [ $ret -eq 0 ] && [ -x "$tar" ]; then
+ echo "tar=$tar"
+ echo "version:"
+ $tar --version
+ ret=$?
+fi
- if [ $ret -eq 0 ]; then
- (exit 0)
- else
- echo "No suitable tar program found."
- exit 1
- fi
+if [ $ret -eq 0 ]; then
+ (exit 0)
+else
+ echo "No suitable tar program found."
+ exit 1
fi
+
# Try to find a suitable make
# If the MAKE environment var is set, use that.
# otherwise, try to find gmake, and then make.