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

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

Author: ryan52-guest
Date: Sat Jul 25 17:22:12 2009
New Revision: 40737

URL: http://svn.debian.org/wsvn/?sc=1&rev=40737
Log:
fixes

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

Modified: scripts/repack.sh
URL: http://svn.debian.org/wsvn/scripts/repack.sh?rev=40737&op=diff
==============================================================================
--- scripts/repack.sh (original)
+++ scripts/repack.sh Sat Jul 25 17:22:12 2009
@@ -45,7 +45,7 @@
 	UP_BASE="$UP_BASE/`ls -1 "$UP_BASE"`"
 fi
 
-RM_OPTS="-vr"
+RM_OPTS="-vrf"
 
 real_rm(){
     /bin/rm "$@"
@@ -56,13 +56,29 @@
 }
 
 rm(){
+    if [ "$MANIFEST" = "1" ]; then
+        PERM=$(stat --format=%a "$UP_BASE/MANIFEST")
+        chmod u+w "$UP_BASE/MANIFEST"
+    fi
     for i in "$@"; do
-        real_rm "$RM_OPTS" "$UP_BASE/$i"
         if [ "$MANIFEST" = "1" ]; then
-            grep -v "^$i$" "$UP_BASE/MANIFEST" > "$DIR/MANIFEST"
+            PATTERN="^$i"
+            if [ -d "$UP_BASE/$i" ]; then
+                if ! { echo "$PATTERN" | grep -q "/$" ; }; then
+                    PATTERN="${PATTERN}/"
+                fi
+            else
+                PATTERN="${PATTERN}$"
+            fi
+            grep -v "$PATTERN" "$UP_BASE/MANIFEST" > "$DIR/MANIFEST"
             real_mv "$DIR/MANIFEST" "$UP_BASE/MANIFEST"
         fi
+        real_rm "$RM_OPTS" "$UP_BASE/$i"
     done
+    if [ "$MANIFEST" = "1" ]; then
+        chmod $PERM "$UP_BASE/MANIFEST"
+    fi
+
 }
 
 mv(){

Modified: scripts/repack.stub
URL: http://svn.debian.org/wsvn/scripts/repack.stub?rev=40737&op=diff
==============================================================================
--- scripts/repack.stub (original)
+++ scripts/repack.stub Sat Jul 25 17:22:12 2009
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# put this in debian/repack.sh and add "debian sh debian/repack.sh" to
+# put this in debian/repack.stub and add "debian sh debian/repack.stub" to
 # the end of the line in debian/watch
 
 # then create a debian/repack.local. this is a shell script that is
@@ -16,7 +16,7 @@
 
 # special variables:
 # SUFFIX (defaults to +dfsg)
-# RM_OPTS (defaults to -rv)
+# RM_OPTS (defaults to -vrf)
 # MANIFEST (defaults to 0, set to 1 to turn on. this will manipulate
 #           MANIFEST files in CPAN tarballs.)