cleanup

git-svn-id: svn+slack://slack.fluxo.info/var/svn/simplepkg@599 04377dda-e619-0410-9926-eae83683ac58

1 files changed, 34 insertions, 33 deletions

diff --git a/trunk/src/createpkg b/trunk/src/createpkg
index 5c82f7f..a11a101 100644
--- a/trunk/src/createpkg
+++ b/trunk/src/createpkg
@@ -527,11 +527,11 @@ PKG_NAME="`ls -1 -c $MAKEPKG_REPOS/$PACKAGE-*-*-*.tgz | head -n 1 | xargs basena
 # Create repository directory
 if [ ! -e $NEW_REPOS ]; then
   if [ -d "$MAKEPKG_REPOS/.svn" ] && ! svn_check $NEW_REPOS; then
-    cwd="`pwd`"
-    cd $MAKEPKG_REPOS
-    chown_svn $MAKEPKG_REPOS && chgrp_svn $MAKEPKG_REPOS
-    svn_mkdir $( echo ${SCRIPT_BASE#$SLACKBUILDS_DIR/} )
-    cd $cwd
+    (
+      cd $MAKEPKG_REPOS
+      chown_svn $MAKEPKG_REPOS && chgrp_svn $MAKEPKG_REPOS
+      svn_mkdir $( echo ${SCRIPT_BASE#$SLACKBUILDS_DIR/} )
+    )
   else
     mkdir -p $NEW_REPOS
   fi
@@ -553,33 +553,34 @@ if [ $REMOVE_OLD_PACKAGE -eq $on ]; then
   # Using subversion
   if [ -d "$MAKEPKG_REPOS/.svn" ]; then
 
-    cwd="`pwd`"
-    cd $MAKEPKG_REPOS
+    (
 
-    PACKAGE_VERSION="`package_version $PKG_NAME`"
-    PACKAGE_ARCH="`package_arch $PKG_NAME`"
-    PACKAGE_BUILD="`package_build $PKG_NAME`"
+      cd $MAKEPKG_REPOS
 
-    # Using -mindepth 2 so it doesn't delete the new package
-    for file in `find . -mindepth 2 -name "$PACKAGE-*-*-*.tgz" -o -name "$PACKAGE-*-*-*.meta"`; do
-      candidate="`echo $file | sed -e 's/\.meta/\.tgz/'`" # otherwise package info functions can fail
-      # Just delete packages with different arch, version or build number
-      if [ "`package_version $candidate`" != "$PACKAGE_VERSION" ] || \
-         [ "`package_arch $candidate`" != "$PACKAGE_ARCH" ] || \
-         [ "`package_build $candidate`" != "$PACKAGE_BUILD" ]; then
-        svn_del $file
-      fi
-    done
+      PACKAGE_VERSION="`package_version $PKG_NAME`"
+      PACKAGE_ARCH="`package_arch $PKG_NAME`"
+      PACKAGE_BUILD="`package_build $PKG_NAME`"
 
-    for file in `find $MAKEPKG_REPOS -name "$PACKAGE.slack-required"`; do
-      if [ $MOVE_SLACK_REQUIRED -eq $off ]; then
-        svn_del $file
-      elif [ ! -z "$SLACK_REQUIRED" ] && [ "$NEW_REPOS/$PACKAGE.slack-required" != "$file" ]; then
-        svn_del $file
-      fi
-    done
+      # Using -mindepth 2 so it doesn't delete the new package
+      for file in `find . -mindepth 2 -name "$PACKAGE-*-*-*.tgz" -o -name "$PACKAGE-*-*-*.meta"`; do
+        candidate="`echo $file | sed -e 's/\.meta/\.tgz/'`" # otherwise package info functions can fail
+        # Just delete packages with different arch, version or build number
+        if [ "`package_version $candidate`" != "$PACKAGE_VERSION" ] || \
+          [ "`package_arch $candidate`" != "$PACKAGE_ARCH" ] || \
+          [ "`package_build $candidate`" != "$PACKAGE_BUILD" ]; then
+          svn_del $file
+        fi
+      done
 
-    cd $cwd
+      for file in `find $MAKEPKG_REPOS -name "$PACKAGE.slack-required"`; do
+        if [ $MOVE_SLACK_REQUIRED -eq $off ]; then
+          svn_del $file
+        elif [ ! -z "$SLACK_REQUIRED" ] && [ "$NEW_REPOS/$PACKAGE.slack-required" != "$file" ]; then
+          svn_del $file
+        fi
+      done
+
+    )
 
   else
     # Using -mindepth 2 so it doesn't delete the new package
@@ -594,11 +595,11 @@ if [ $MOVE_BIN_PACKAGE -eq $on ]; then
 
   mv $MAKEPKG_REPOS/$PKG_NAME $NEW_REPOS/
   if [ -d "$NEW_REPOS/.svn" ]; then
-    cwd="`pwd`"
-    cd $NEW_REPOS
-    chown_svn $MAKEPKG_REPOS && chgrp_svn $MAKEPKG_REPOS
-    svn_add $PKG_NAME
-    cd $cwd
+    (
+      cd $NEW_REPOS
+      chown_svn $MAKEPKG_REPOS && chgrp_svn $MAKEPKG_REPOS
+      svn_add $PKG_NAME
+    )
   fi
 
   # Move package's slack-required to binary repository