r40119 - in /scripts: repack.sh repack.stub

[ryan52-guest at users.alioth.debian.org]

Author: ryan52-guest
Date: Sat Jul 18 16:47:04 2009
New Revision: 40119

URL: http://svn.debian.org/wsvn/?sc=1&rev=40119
Log:
add mv

Modified:
    scripts/repack.sh
    scripts/repack.stub

Modified: scripts/repack.sh
URL: http://svn.debian.org/wsvn/scripts/repack.sh?rev=40119&op=diff
==============================================================================
--- scripts/repack.sh (original)
+++ scripts/repack.sh Sat Jul 18 16:47:04 2009
@@ -31,6 +31,14 @@
 
 RM_OPTS="-vr"
 
+real_rm(){
+    /bin/rm "$@"
+}
+
+real_mv(){
+    /bin/mv "$@"
+}
+
 rm(){
     for i in "$@"; do
         /bin/rm "$RM_OPTS" "$UP_BASE/$i"
@@ -39,6 +47,17 @@
             mv "$DIR/MANIFEST" "$UP_BASE/MANIFEST"
         fi
     done
+}
+
+mv(){
+    OLD=$(pwd)
+    cd $UP_BASE
+    mv "$@"
+    cd $OLD
+    if [ "$MANIFEST" = "1" ]; then
+        echo "MANIFEST cannot be manipulated with mv yet, patches welcome"
+        exit 1
+    fi
 }
 
 # bump with incompatible changes
@@ -59,12 +78,12 @@
 REPACK_DIR="$PKG-${VER}${SUFFIX}.orig" # DevRef § 6.7.8.2
 DFSG_TAR="../${PKG}_${VER}${SUFFIX}.orig.tar.gz"
 
-mv "$UP_BASE" "$DIR/$REPACK_DIR"
+real_mv "$UP_BASE" "$DIR/$REPACK_DIR"
 
 # Using a pipe hides tar errors!
 tar cfC "$DIR/repacked.tar" "$DIR" "$REPACK_DIR"
 gzip -9 < "$DIR/repacked.tar" > "$DIR/repacked.tar.gz"
 
-mv "$DIR/repacked.tar.gz" "$DFSG_TAR"
+real_mv "$DIR/repacked.tar.gz" "$DFSG_TAR"
 
 echo "*** $DFSG_TAR ready"

Modified: scripts/repack.stub
URL: http://svn.debian.org/wsvn/scripts/repack.stub?rev=40119&op=diff
==============================================================================
--- scripts/repack.stub (original)
+++ scripts/repack.stub Sat Jul 18 16:47:04 2009
@@ -8,7 +8,9 @@
 
 # special functions:
 # rm is replaced by a function that does some magic ("rm -rv" by
-#    default)
+#    default), but also changes MANIFEST if $MANIFEST is 1
+# mv is replaced by a function that just does mv (by default), but
+#    also changes MANIFEST if $MANIFEST is 1
 # requires_version is there for future usage for requiring certain
 #    versions of the script