Simplify paths0.35.2

Signed-off-by: Alejandro Colomar <alx.manpages@gmail.com>

6 files changed, 28 insertions, 22 deletions

diff --git a/bin/containers/delete.sh b/bin/containers/delete.sh
index b512221..8d01d70 100755
--- a/bin/containers/delete.sh
+++ b/bin/containers/delete.sh
@@ -16,7 +16,8 @@ fi;
 stability="$1";
 
 _d="$(dirname "${BASH_SOURCE[0]}")";
-. ${_d}/../../etc/www/config.sh;
+_D="${_d}/../..";
+. ${_D}/etc/www/config.sh;
 
 stack="${WWW_PROJECT}-${stability}";
 alx_stack_delete -o "${WWW_DK_ORCHESTRATOR}" "${stack}";
diff --git a/bin/containers/deploy.sh b/bin/containers/deploy.sh
index 8af2067..422da6b 100755
--- a/bin/containers/deploy.sh
+++ b/bin/containers/deploy.sh
@@ -21,7 +21,8 @@ if [ $(id -u) -ne 0 ]; then
 fi;
 
 _d="$(dirname "${BASH_SOURCE[0]}")";
-. ${_d}/../../etc/www/config.sh;
+_D="${_d}/../..";
+. ${_D}/etc/www/config.sh;
 
 alx_stack_deploy -o "${WWW_DK_ORCHESTRATOR}" "${WWW_STACK}";
 
diff --git a/bin/version/branch.sh b/bin/version/branch.sh
index 0b21af1..fcb49e0 100755
--- a/bin/version/branch.sh
+++ b/bin/version/branch.sh
@@ -24,11 +24,12 @@ if [ $# -ne 0 ]; then
 fi;
 
 _d="$(dirname "${BASH_SOURCE[0]}")";
-. ${_d}/../../etc/www/config.sh;
-. ${_d}/../../lib/www/version/date.sh;
-. ${_d}/../../lib/www/version/port.sh;
-. ${_d}/../../lib/www/version/stability.sh;
-. ${_d}/../../lib/www/version/version.sh;
+_D="${_d}/../..";
+. ${_D}/etc/www/config.sh;
+. ${_D}/lib/www/version/date.sh;
+. ${_D}/lib/www/version/port.sh;
+. ${_D}/lib/www/version/stability.sh;
+. ${_D}/lib/www/version/version.sh;
 
 branch=$(git branch --show-current);
 
diff --git a/bin/version/release_exp.sh b/bin/version/release_exp.sh
index 05ec62b..a87ebdd 100755
--- a/bin/version/release_exp.sh
+++ b/bin/version/release_exp.sh
@@ -17,11 +17,12 @@ fi;
 version="$1";
 
 _d="$(dirname "${BASH_SOURCE[0]}")";
-. ${_d}/../../etc/www/config.sh;
-. ${_d}/../../lib/www/version/date.sh;
-. ${_d}/../../lib/www/version/port.sh;
-. ${_d}/../../lib/www/version/stability.sh;
-. ${_d}/../../lib/www/version/version.sh;
+_D="${_d}/../..";
+. ${_D}/etc/www/config.sh;
+. ${_D}/lib/www/version/date.sh;
+. ${_D}/lib/www/version/port.sh;
+. ${_D}/lib/www/version/stability.sh;
+. ${_D}/lib/www/version/version.sh;
 
 update_date;
 update_port		"${WWW_PORT_EXP}";
diff --git a/bin/version/release_rc.sh b/bin/version/release_rc.sh
index 7d79111..5670232 100755
--- a/bin/version/release_rc.sh
+++ b/bin/version/release_rc.sh
@@ -17,11 +17,12 @@ fi;
 version="$1";
 
 _d="$(dirname "${BASH_SOURCE[0]}")";
-. ${_d}/../../etc/www/config.sh;
-. ${_d}/../../lib/www/version/date.sh;
-. ${_d}/../../lib/www/version/port.sh;
-. ${_d}/../../lib/www/version/stability.sh;
-. ${_d}/../../lib/www/version/version.sh;
+_D="${_d}/../..";
+. ${_D}/etc/www/config.sh;
+. ${_D}/lib/www/version/date.sh;
+. ${_D}/lib/www/version/port.sh;
+. ${_D}/lib/www/version/stability.sh;
+. ${_D}/lib/www/version/version.sh;
 
 update_date;
 update_port		${WWW_PORT_RC};
diff --git a/bin/version/release_stable.sh b/bin/version/release_stable.sh
index 26fdf7c..c0ca730 100755
--- a/bin/version/release_stable.sh
+++ b/bin/version/release_stable.sh
@@ -17,11 +17,12 @@ fi;
 version="$1";
 
 _d="$(dirname "${BASH_SOURCE[0]}")";
-. ${_d}/../../etc/www/config.sh;
-. ${_d}/../../lib/www/version/date.sh;
-. ${_d}/../../lib/www/version/port.sh;
-. ${_d}/../../lib/www/version/stability.sh;
-. ${_d}/../../lib/www/version/version.sh;
+_D="${_d}/../..";
+. ${_D}/etc/www/config.sh;
+. ${_D}/lib/www/version/date.sh;
+. ${_D}/lib/www/version/port.sh;
+. ${_D}/lib/www/version/stability.sh;
+. ${_D}/lib/www/version/version.sh;
 
 update_date;
 update_port		${WWW_PORT_STABLE};