From: Jo-Philipp Wich <jo@mein.io>
Date: Mon, 15 Aug 2016 11:27:11 +0000 (+0200)
Subject: scripts: ipkg-build: do not require git or svn
X-Git-Tag: v17.01.0-rc1~1719
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=3a3424981c27e3c3ca35e076bcc0f399f86649c3;p=openwrt%2Fstaging%2Fchunkeey.git

scripts: ipkg-build: do not require git or svn

Move the "which svn" and "which git" calls next to the timestamp commands
using those tools to not prematurely fail on systems where svn or git are
not present.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
---

diff --git a/scripts/ipkg-build b/scripts/ipkg-build
index e026c7a157..845a6ed04e 100755
--- a/scripts/ipkg-build
+++ b/scripts/ipkg-build
@@ -13,14 +13,14 @@ version=1.0
 FIND="$(which find)"
 FIND="${FIND:-$(which gfind)}"
 TAR="${TAR:-$(which tar)}"
-SVN="$(which svn)"
-GIT="$(which git)"
 GZIP="$(which gzip)"
 
 # look up date of last commit
 if [ -d "$TOPDIR/.git" ]; then
+	GIT="$(which git)"
 	TIMESTAMP=$(cd $TOPDIR; $GIT log -1 -s --format=%ci)
 elif [ -d "$TOPDIR/.svn" ]; then
+	SVN="$(which svn)"
 	TIMESTAMP=$($SVN info "$TOPDIR" | sed -n "s/^Last Changed Date: \(.*\)/\1/p")
 else
 	TIMESTAMP=$(date)