diff --git a/scripts/mvn-phase-lib.sh b/scripts/mvn-phase-lib.sh
index 5293f47..aa3f637 100644
--- a/scripts/mvn-phase-lib.sh
+++ b/scripts/mvn-phase-lib.sh
@@ -275,15 +275,15 @@
 {
   rm -rf ./*.tgz ./*.zip venv-pkg
   
-  SETUPFILES=$(find $(pwd) -name "setup.py")
+  SETUPFILES=$(find "$(pwd)" -name "setup.py")
   CURDIR=$(pwd)
   for SETUPFILE in $SETUPFILES; do
     PLUGIN_FULL_DIR=$(dirname "$SETUPFILE")
-    PLUGIN_BASE_DIR=$(basename "$PLUGIN_DIR")
+    PLUGIN_BASE_DIR=$(basename "$PLUGIN_FULL_DIR")
     PLUGIN_NAME=$(grep 'name' "$SETUPFILE" | cut -f2 -d'=' | sed 's/[^0-9a-zA-Z\.]*//g')
     PLUGIN_VERSION=$(grep 'version' "$SETUPFILE" | cut -f2 -d'=' | sed 's/[^0-9\.]*//g')
 
-    cd ${PLUGIN_FULL_DIR}/..
+    cd "${PLUGIN_FULL_DIR}"/..
     echo "In $(pwd), build plugin zip $PLUGIN_NAME, version $PLUGIN_VERSION"
 
     zip -r "${PLUGIN_NAME}-${PLUGIN_VERSION}.zip" "./${PLUGIN_BASE_DIR}"
@@ -349,15 +349,15 @@
 
 upload_wagon_archives()
 {
-  SETUPFILES=$(find $(pwd) -name "setup.py")
+  SETUPFILES=$(find "$(pwd)" -name "setup.py")
   CURDIR=$(pwd)
   for SETUPFILE in $SETUPFILES; do
     PLUGIN_FULL_DIR=$(dirname "$SETUPFILE")
-    PLUGIN_BASE_DIR=$(basename "$PLUGIN_DIR")
+    PLUGIN_BASE_DIR=$(basename "$PLUGIN_FULL_DIR")
     PLUGIN_NAME=$(grep 'name' "$SETUPFILE" | cut -f2 -d'=' | sed 's/[^0-9a-zA-Z\.]*//g')
     PLUGIN_VERSION=$(grep 'version' "$SETUPFILE" | cut -f2 -d'=' | sed 's/[^0-9\.]*//g')
 
-    cd ${PLUGIN_FULL_DIR}/..
+    cd "${PLUGIN_FULL_DIR}"/..
     echo "In $(pwd), upload zip archive for $PLUGIN_NAME, version $PLUGIN_VERSION"
     ARCHIVE_FILE_NAME="${PLUGIN_NAME}-${PLUGIN_VERSION}.zip" 
     if [ -z "$ARCHIVE_FILE_NAME" ]; then
@@ -374,7 +374,7 @@
     fi
     upload_raw_file "${ARCHIVE_FILE_NAME}" "${PLUGIN_NAME}/${PLUGIN_VERSION}"
 
-    cd ${CURDIR}
+    cd "${CURDIR}"
   done
 }