slic3r#4635 Move source dir determinator into common utilties.

klocs · Dec 31, 2018 · ed45c01 · ed45c01
1 parent 63c7d68
commit ed45c01
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 0 deletions.
diff --git a/package/common/util.sh b/package/common/util.sh
@@ -1,5 +1,21 @@
 #!/bin/bash
 
+function set_source_dir ()
+{
+    if [[ -z ${TRAVIS_BUILD_DIR+x} ]]; then
+        if [[ ! -z ${1+x} ]]; then
+            SLIC3R_DIR=$1
+            echo "Using SLIC3R_DIR = $1"
+        else
+            SLIC3R_DIR=$(pwd)
+            echo "Using current directory as source dir"
+        fi
+    else
+        SLIC3R_DIR="$TRAVIS_BUILD_DIR"
+        echo "Using Travis build dir"
+    fi
+}
+
 # must be run from the root
 function set_version ()
 {

diff --git a/package/linux/appimage.sh b/package/linux/appimage.sh
@@ -9,6 +9,7 @@
 
 source $(dirname $0)/../common/util.sh
 
+set_source_dir $2
 set_version
 get_commit
 set_build_id

diff --git a/package/linux/make_archive.sh b/package/linux/make_archive.sh
@@ -17,6 +17,7 @@ source $(dirname $0)/../common/util.sh
 # Determine if this is a tagged (release) commit.
 # Change the build id accordingly.
 
+set_source_dir $2
 set_version
 get_commit
 set_build_id