OpenWrt – Diff between revs 2 and 3

Subversion Repositories:
Rev:
Show entire file – Ignore whitespace
Rev 2 Rev 3
Line 13... Line 13...
13 FIND="$(which find)" 13 FIND="$(which find)"
14 FIND="${FIND:-$(which gfind)}" 14 FIND="${FIND:-$(which gfind)}"
15 TAR="${TAR:-$(which tar)}" 15 TAR="${TAR:-$(which tar)}"
16 GZIP="$(which gzip)" 16 GZIP="$(which gzip)"
Line 17... Line -...
17   -  
18 # try to use fixed source epoch -  
19 if [ -n "$SOURCE_DATE_EPOCH" ]; then -  
20 TIMESTAMP=$(date --date="@$SOURCE_DATE_EPOCH") -  
21   17  
22 # look up date of last commit 18 # look up date of last commit
23 elif [ -d "$TOPDIR/.git" ]; then 19 if [ -d "$TOPDIR/.git" ]; then
24 GIT="$(which git)" 20 GIT="$(which git)"
25 TIMESTAMP=$(cd $TOPDIR; $GIT log -1 -s --format=%ci) 21 TIMESTAMP=$(cd $TOPDIR; $GIT log -1 -s --format=%ci)
26 elif [ -d "$TOPDIR/.svn" ]; then 22 elif [ -d "$TOPDIR/.svn" ]; then
27 SVN="$(which svn)" 23 SVN="$(which svn)"
Line 62... Line 58...
62 for cf in `$FIND $(sed -e "s!^/!$pkg_dir/!" $CONTROL/conffiles) -type f`; do 58 for cf in `$FIND $(sed -e "s!^/!$pkg_dir/!" $CONTROL/conffiles) -type f`; do
63 echo "${cf#$pkg_dir}" >> $CONTROL/conffiles.resolved 59 echo "${cf#$pkg_dir}" >> $CONTROL/conffiles.resolved
64 done 60 done
Line 65... Line 61...
65   61  
66 rm $CONTROL/conffiles -  
67 if [ -f $CONTROL/conffiles.resolved ]; then 62 rm $CONTROL/conffiles
68 mv $CONTROL/conffiles.resolved $CONTROL/conffiles 63 mv $CONTROL/conffiles.resolved $CONTROL/conffiles
69 chmod 0644 $CONTROL/conffiles -  
70 fi 64 chmod 0644 $CONTROL/conffiles
Line 71... Line 65...
71 fi 65 fi
72   66  
73 cd $owd 67 cd $owd