[ooo-build-commit] .: 2 commits - bin/g bin/unpack

[Fridrich Strba]

 bin/g      |   10 ++++++----
 bin/unpack |    2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

New commits:
commit 4f9da87e24f0215eb5e3e4c90a7a328957f35ecf
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Mon Sep 20 08:43:54 2010 +0200

    Some systems don't have readlink -e, so rewrite to use readlink -f

diff --git a/bin/g b/bin/g
index e94342f..a755a6a 100755
--- a/bin/g
+++ b/bin/g
@@ -9,8 +9,10 @@ if [ "$#" -eq "0" ] ; then
     exit $?
 fi
 
-CLONEDIR=`readlink -e $0 | sed 's/\/bin\/g$/\/clone/'`
-RAWBUILDDIR=`readlink -e $0 | sed 's/\/bin\/g$/\/rawbuild/'`
+CLONEDIR=`readlink -f $0 | sed 's/\/bin\/g$/\/clone/'`
+if [ ! -e ${CLONEDIR} ]; then mkdir -p $CLONEDIR; fi
+RAWBUILDDIR=`readlink -f $0 | sed 's/\/bin\/g$/\/rawbuild/'`
+if [ ! -e ${RAWBUILDDIR} ]; then mkdir -p $RAWBUILDDIR; fi
 
 # extra params for some commands, like log
 EXTRA=
@@ -70,8 +72,8 @@ while shift ; do
         fi
 
         # make the paths absolute
-        FILES[$FILESNUM]=`readlink -n -e "$PARAM"`
-        if [ -z "${FILES[$FILESNUM]}" ] ; then
+        FILES[$FILESNUM]=`readlink -n -f "$PARAM"`
+        if [ -z "${FILES[$FILESNUM]}" -o ! -e "${FILES[$FILESNUM]}" ] ; then
             # it is probably not a file, but a tag name, or something
             FILES[$FILESNUM]="$PARAM"
         fi
commit d1f41e5e5ae2dc64f26662abd4ca90c7e5c68c47
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Mon Sep 20 08:42:34 2010 +0200

    Preserve time when rsyncing + exclude all output directories

diff --git a/bin/unpack b/bin/unpack
index 4197d5a..91076a4 100755
--- a/bin/unpack
+++ b/bin/unpack
@@ -302,7 +302,7 @@ else
     echo "* copying $RAWBUILDDIR into $OOBUILDDIR..."
     #cp -pLR "$RAWBUILDDIR" "$OOBUILDDIR"
     touch "$CLONEDIR/repos_changed"
-    rsync -prL --exclude .git --exclude 'unxlng??.pro' --exclude 'wntmsci??.pro' "$RAWBUILDDIR/" "$OOBUILDDIR/"
+    rsync -prLt --exclude .git --exclude 'unx*.pro' --exclude 'wnt*.pro' "$RAWBUILDDIR/" "$OOBUILDDIR/"
     touch "$TOOLSDIR/stamp/refresh"
     if test -d "$CLONEDIR/l10n" ; then
 	echo "* copying translations into $OOBUILDDIR..."