Fixed bug in various script files

collector/run-collector.sh

 #!/usr/bin/env bash
 
 # Set paths
-BASE_DIR="$(readlink -f "$(dirname $0)")"
+BASE_DIR="$(dirname "$(readlink -f "$0")")"
 TARGET_DIR="${BASE_DIR}/target"
 LIB_DIR="${BASE_DIR}/lib"
 CONFIG_DIR="${BASE_DIR}/config"

demo/cleanup_network.sh

@@ -15,7 +15,7 @@ msg() {
 
 [ $EUID -eq 0 ] || abort "Must run as root"
 
-LOCAL_DIR="$(readlink -f "$(dirname "$0")")"
+LOCAL_DIR="$(dirname "$(readlink -f "$0")")"
 NETMANAGER_RUN="$LOCAL_DIR/../network-manager/run_netmanager.py"
 
 msg "Cleaning up network manager..."

demo/launch_network.sh

@@ -15,7 +15,7 @@ msg() {
 
 [ $EUID -eq 0 ] || abort "Must run as root"
 
-LOCAL_DIR="$(readlink -f "$(dirname "$0")")"
+LOCAL_DIR="$(dirname "$(readlink -f "$0")")"
 if ! [ -d "$LOCAL_DIR/../collector/target" -a -d "$LOCAL_DIR/../sdncontroller/target" ]; then
     abort "Must build collector and sdncontroller applications first"
 fi

demo/launch_visualiser.sh

@@ -13,7 +13,7 @@ msg() {
     fi
 }
 
-LOCAL_DIR="$(readlink -f "$(dirname "$0")")"
+LOCAL_DIR="$(dirname "$(readlink -f "$0")")"
 if ! [ -d "$LOCAL_DIR/../xml-proxy/target" ]; then
     abort "Must build xml-proxy application first"
 fi

network-manager/clean.sh

@@ -13,7 +13,7 @@ msg() {
     fi
 }
 
-LOCAL_DIR="$(readlink -f "$(dirname "$0")")"
+LOCAL_DIR="$(dirname "$(readlink -f "$0")")"
 if cd "$LOCAL_DIR"; then
     msg "Cleaning built files..."
     find . -name "*.pyc" -exec rm -vf {} \;

network-visualiser/clean.sh

@@ -13,7 +13,7 @@ msg() {
     fi
 }
 
-LOCAL_DIR="$(readlink -f "$(dirname "$0")")"
+LOCAL_DIR="$(dirname "$(readlink -f "$0")")"
 if cd "$LOCAL_DIR/catalina"; then
     msg "Cleaning built files..."
     rm -rfv "./logs"

network-visualiser/start.sh

@@ -44,7 +44,7 @@ if ! [ -n "$JRE_HOME" -o -n "$JAVA_HOME" ]; then
     export JRE_HOME="$(readlink -v -e "$(which java)" | sed 's:bin/java::')"
 fi
 
-LOCAL_DIR="$(readlink -f "$(dirname "$0")")"
+LOCAL_DIR="$(dirname "$(readlink -f "$0")")"
 export SEGRID_HOME="$LOCAL_DIR"
 export CATALINA_BASE="$LOCAL_DIR/catalina"
 

sdncontroller/run-sdncontroller.sh

 #!/usr/bin/env bash
 
 # Set paths
-BASE_DIR="$(readlink -f "$(dirname $0)")"
+BASE_DIR="$(dirname "$(readlink -f "$0")")"
 TARGET_DIR="${BASE_DIR}/target"
 LIB_DIR="${BASE_DIR}/lib"
 CONFIG_DIR="${BASE_DIR}/config"

xml-proxy/run-xmlproxy.sh

 #!/usr/bin/env bash
 
 # Set paths
-BASE_DIR="$(readlink -f "$(dirname $0)")"
+BASE_DIR="$(dirname "$(readlink -f "$0")")"
 TARGET_DIR="${BASE_DIR}/target"
 LIB_DIR="${BASE_DIR}/lib"
 CONFIG_DIR="${BASE_DIR}/config"

xml-proxy/test/run-mininet-client.sh

 #!/usr/bin/env bash
 
-BASE_DIR="$(readlink -f "$(dirname $0)")"
+BASE_DIR="$(dirname "$(readlink -f "$0")")"
 TARGET_DIR="${BASE_DIR}/../target"
 
 XML_PROXY_JAR="${TARGET_DIR}/varanus-xmlproxy.jar"

xml-proxy/test/run-xml-client.sh

 #!/usr/bin/env bash
 
-BASE_DIR="$(readlink -f "$(dirname $0)")"
+BASE_DIR="$(dirname "$(readlink -f "$0")")"
 TARGET_DIR="${BASE_DIR}/../target"
 
 XML_PROXY_JAR="${TARGET_DIR}/varanus-xmlproxy.jar"