hak5
/
openwrt
mirror of https://github.com/hak5/openwrt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
lede-17.01
Jo-Philipp Wich 2016-08-15 13:27:11 +02:00
parent d9345bc5bf
commit 3a3424981c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/ipkg-build
View File

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