fix quoting of bundle filename

[code/mbuild.git] / mbuild.sh

diff --git a/mbuild.sh b/mbuild.sh
index e102122e002a05c3c97e71710d5d4caf843ae9e1..99ffb2a67b0e404b532e817b8b05812fb57af4f8 100755 (executable)
--- a/mbuild.sh
+++ b/mbuild.sh
@@ -30,8 +30,6 @@ if [ -z "$KEYID" ]; then
   exit 1
 fi
 
   exit 1
 fi
 

-cd "$BUILDDIR"
-

 sbuild_args=
 schangesfile=
 arch=
 sbuild_args=
 schangesfile=
 arch=


@@ -65,7 +63,10 @@ done
 schangesfile_basename="${schangesfile##*/}"
 packagenameversion="${schangesfile_basename%_*}"
 
 schangesfile_basename="${schangesfile##*/}"
 packagenameversion="${schangesfile_basename%_*}"
 

-cd "${schangesfile%/*}"
+case "$schangesfile" in
+  */*) cd "${schangesfile%/*}";;
+  *) :;;
+esac

 dcmd cp "${schangesfile##*/}" "$BUILDDIR"
 schangesfile="$schangesfile_basename"
 
 dcmd cp "${schangesfile##*/}" "$BUILDDIR"
 schangesfile="$schangesfile_basename"
 


@@ -89,7 +90,7 @@ BUILD_PREFIX="${packagenameversion}_${arch}.${DATESTR}"
 mv current "${BUILD_PREFIX}".buildlog
 rm -f current-*
 
 mv current "${BUILD_PREFIX}".buildlog
 rm -f current-*
 

-bundle="${BUNDLE_DIR}/${BUILD_PREFIX}".bundle.tar"
+bundle="${BUNDLE_DIR}/${BUILD_PREFIX}".bundle.tar

 tar -chf "$bundle" *
 
 rm -r "$BUILDDIR"
 tar -chf "$bundle" *
 
 rm -r "$BUILDDIR"