From 0f1406da7d7c7619f2b75df99f28bb0d22fdf6e9 Mon Sep 17 00:00:00 2001
From: alemuntoni <muntoni.alessandro@gmail.com>
Date: Tue, 16 Jun 2020 13:14:12 +0200
Subject: [PATCH] fixing linux scripts

---
 install/linux/linux_appimages.sh          | 8 ++++----
 install/linux/linux_build.sh              | 4 ++--
 install/linux/linux_build_meshlab_mini.sh | 4 ++--
 install/linux/linux_deploy.sh             | 8 ++++----
 install/linux/linux_make_boundle.sh       | 6 +++---
 install/linux/linux_make_it.sh            | 4 ++--
 6 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/install/linux/linux_appimages.sh b/install/linux/linux_appimages.sh
index 8dddb0099..4227c6f36 100644
--- a/install/linux/linux_appimages.sh
+++ b/install/linux/linux_appimages.sh
@@ -11,17 +11,17 @@
 #
 # You can give as argument the DISTRIB_PATH.
 
-cd "$(dirname "$(realpath "$0")")"; #move to script directory
-INSTALL_PATH=$(pwd)
-
 #checking for parameters
 if [ "$#" -eq 0 ]
 then
-    DISTRIB_PATH=$PWD/../../distrib
+    DISTRIB_PATH="../../distrib"
 else
     DISTRIB_PATH=$(realpath $1)
 fi
 
+cd "$(dirname "$(realpath "$0")")"; #move to script directory
+INSTALL_PATH=$(pwd)
+
 cd $DISTRIB_PATH
 
 export VERSION=$(cat $INSTALL_PATH/../../ML_VERSION)
diff --git a/install/linux/linux_build.sh b/install/linux/linux_build.sh
index 503cfd847..802aec96b 100644
--- a/install/linux/linux_build.sh
+++ b/install/linux/linux_build.sh
@@ -9,8 +9,6 @@
 # You can give as argument the BUILD_PATH, and meshlab binaries will be
 # then placed inside BUILD_PATH/distrib.
 
-cd "$(dirname "$(realpath "$0")")"; #move to script directory
-
 #checking for parameters
 if [ "$#" -eq 0 ]
 then
@@ -19,6 +17,8 @@ else
     BUILD_PATH=$(realpath $1)
 fi
 
+cd "$(dirname "$(realpath "$0")")"; #move to script directory
+
 if ! [ -d $BUILD_PATH ]
 then
     mkdir $BUILD_PATH
diff --git a/install/linux/linux_build_meshlab_mini.sh b/install/linux/linux_build_meshlab_mini.sh
index 368fa5b66..923e90dfa 100644
--- a/install/linux/linux_build_meshlab_mini.sh
+++ b/install/linux/linux_build_meshlab_mini.sh
@@ -9,8 +9,6 @@
 # You can give as argument the BUILD_PATH, and meshlab binaries will be
 # then placed inside BUILD_PATH/distrib.
 
-cd "$(dirname "$(realpath "$0")")"; #move to script directory
-
 #checking for parameters
 if [ "$#" -eq 0 ]
 then
@@ -19,6 +17,8 @@ else
     BUILD_PATH=$(realpath $1)
 fi
 
+cd "$(dirname "$(realpath "$0")")"; #move to script directory
+
 if ! [ -d $BUILD_PATH ]
 then
     mkdir $BUILD_PATH
diff --git a/install/linux/linux_deploy.sh b/install/linux/linux_deploy.sh
index 90cdd6e7c..72bb47f4c 100644
--- a/install/linux/linux_deploy.sh
+++ b/install/linux/linux_deploy.sh
@@ -9,17 +9,17 @@
 # 
 # You can give as argument the DISTRIB_PATH.
 
-cd "$(dirname "$(realpath "$0")")"; #move to script directory
-INSTALL_PATH=$(pwd)
-
 #checking for parameters
 if [ "$#" -eq 0 ]
 then
-    DISTRIB_PATH=$PWD/../../distrib
+    DISTRIB_PATH="../../distrib"
 else
     DISTRIB_PATH=$(realpath $1)
 fi
 
+cd "$(dirname "$(realpath "$0")")"; #move to script directory
+INSTALL_PATH=$(pwd)
+
 cd $DISTRIB_PATH
 
 $INSTALL_PATH/resources/linuxdeployqt usr/share/applications/meshlab.desktop -bundle-non-qt-libs -executable=usr/bin/meshlabserver
diff --git a/install/linux/linux_make_boundle.sh b/install/linux/linux_make_boundle.sh
index 0265bc1f9..2b77ec4c3 100644
--- a/install/linux/linux_make_boundle.sh
+++ b/install/linux/linux_make_boundle.sh
@@ -7,16 +7,16 @@
 #
 # You can give as argument the DISTRIB_PATH.
 
-cd "$(dirname "$(realpath "$0")")"; #move to script directory
-
 #checking for parameters
 if [ "$#" -eq 0 ]
 then
-    DISTRIB_PATH=$PWD/../../distrib
+    DISTRIB_PATH="../../distrib"
 else
     DISTRIB_PATH=$(realpath $1)
 fi
 
+cd "$(dirname "$(realpath "$0")")"; #move to script directory
+
 SOURCE_PATH=$PWD/../../src
 
 INSTALL_PATH=$(pwd)
diff --git a/install/linux/linux_make_it.sh b/install/linux/linux_make_it.sh
index 151bcf483..c59b9302d 100644
--- a/install/linux/linux_make_it.sh
+++ b/install/linux/linux_make_it.sh
@@ -13,8 +13,6 @@
 # You can give as argument the BUILD_PATH, and meshlab binaries and
 # AppImage will be then placed inside BUILD_PATH/distrib.
 
-cd "$(dirname "$(realpath "$0")")"; #move to script directory
-
 #checking for parameters
 if [ "$#" -eq 0 ]
 then
@@ -23,5 +21,7 @@ else
     BUILD_PATH=$(realpath $1)
 fi
 
+cd "$(dirname "$(realpath "$0")")"; #move to script directory
+
 sh linux_build.sh $BUILD_PATH
 sh linux_appimages.sh $BUILD_PATH/distrib