diff --git a/bash/feeders/piaware.sh b/bash/feeders/piaware.sh
index c1f9850..67acc89 100755
--- a/bash/feeders/piaware.sh
+++ b/bash/feeders/piaware.sh
@@ -33,7 +33,7 @@
 
 ## VAARIABLES
 
-BUILDDIR=${PWD}
+BUILDDIR=$PWD
 PIAWAREDIR="$PWD/piaware_builder"
 
 source ../bash/variables.sh
diff --git a/bash/portal/graphs.sh b/bash/portal/graphs.sh
index b8a73bf..8294ec8 100755
--- a/bash/portal/graphs.sh
+++ b/bash/portal/graphs.sh
@@ -31,7 +31,7 @@
 #                                                                                   #
 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
 
-BUILDDIR="${PWD}/build"
+BUILDDIR=$PWD
 
 # Assign the Lighthttpd document root directory to a variable.
 RAWDOCUMENTROOT=`/usr/sbin/lighttpd -f /etc/lighttpd/lighttpd.conf -p | grep server.document-root`
diff --git a/bash/portal/homepage.sh b/bash/portal/homepage.sh
index 44c5678..3511023 100755
--- a/bash/portal/homepage.sh
+++ b/bash/portal/homepage.sh
@@ -31,7 +31,7 @@
 #                                                                                   #
 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
 
-BUILDDIR="${PWD}/build"
+BUILDDIR=$PWD
 
 # Assign the Lighthttpd document root directory to a variable.
 RAWDOCUMENTROOT=`/usr/sbin/lighttpd -f /etc/lighttpd/lighttpd.conf -p | grep server.document-root`
diff --git a/bash/portal/install.sh b/bash/portal/install.sh
index e10a5c5..ac46f59 100755
--- a/bash/portal/install.sh
+++ b/bash/portal/install.sh
@@ -31,9 +31,10 @@
 #                                                                                   #
 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
 
-SCRIPTDIR=${PWD}
+BUILDDIR=$PWD
+BASHDIR=$BUILDDIR/../bash
 
-source ../functions.sh
+source ../bash/functions.sh
 
 clear
 
@@ -64,27 +65,27 @@ CheckPackage rrdtool
 echo -e "\033[33m"
 echo "Installing homepage..."
 echo -e "\033[37m"
-chmod +x $SCRIPTDIR/bash/portal/homepage.sh
-$SCRIPTDIR/bash/portal/homepage.sh
+chmod +x $BASHDIR/portal/homepage.sh
+$BASHDIR/portal/homepage.sh
 
 echo -e "\033[33m"
 echo "Installing map container..."
 echo -e "\033[37m"
-chmod +x $SCRIPTDIR/bash/portal/map.sh
-$SCRIPTDIR/bash/portal/map.sh
+chmod +x $BASHDIR/portal/map.sh
+$BASHDIR/portal/map.sh
 
 echo -e "\033[33m"
 echo "Installing performance graphs..."
 echo -e "\033[37m"
-chmod +x $SCRIPTDIR/bash/portal/graphs.sh
-$SCRIPTDIR/bash/portal/graphs.sh
+chmod +x $BASHDIR/portal/graphs.sh
+$BASHDIR/portal/graphs.sh
 
 if [ $(dpkg-query -W -f='${STATUS}' pfclient 2>/dev/null | grep -c "ok installed") -eq 1 ]; then
     echo -e "\033[33m"
     echo "Installing performance graphs..."
     echo -e "\033[37m"
-    chmod +x $SCRIPTDIR/bash/portal/planefinder.sh
-    $SCRIPTDIR/bash/portal/planefinder.sh
+    chmod +x $BASHDIR/portal/planefinder.sh
+    $BASHDIR/portal/planefinder.sh
 fi
 
 echo -e "\033[33m"
diff --git a/bash/portal/map.sh b/bash/portal/map.sh
index 6a7233f..522fd13 100755
--- a/bash/portal/map.sh
+++ b/bash/portal/map.sh
@@ -31,7 +31,7 @@
 #                                                                                   #
 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
 
-BUILDDIR="${PWD}/build"
+BUILDDIR=$PWD
 
 # Assign the Lighthttpd document root directory to a variable.
 RAWDOCUMENTROOT=`/usr/sbin/lighttpd -f /etc/lighttpd/lighttpd.conf -p | grep server.document-root`
diff --git a/bash/portal/planefinder.sh b/bash/portal/planefinder.sh
index b17c86a..f9a8ffb 100755
--- a/bash/portal/planefinder.sh
+++ b/bash/portal/planefinder.sh
@@ -31,7 +31,7 @@
 #                                                                                   #
 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
 
-BUILDDIR="${PWD}/build"
+BUILDDIR=$PWD
 
 # Assign the Lighthttpd document root directory to a variable.
 RAWDOCUMENTROOT=`/usr/sbin/lighttpd -f /etc/lighttpd/lighttpd.conf -p | grep server.document-root`
diff --git a/install.sh b/install.sh
index 079d516..9bb0cfa 100755
--- a/install.sh
+++ b/install.sh
@@ -36,7 +36,7 @@
 
 ## VARIABLES
 
-BASEDIR=${PWD}
+BASEDIR=$PWD
 BASHDIR="$BASEDIR/bash"
 BUILDDIR="$BASEDIR/build"