Merge pull request #1 from ldennington/install-from-source-suggestions

install from source: custom install location edits

Author: m4ss1m0g

src/linux/Packaging.Linux/Packaging.Linux.csproj

@@ -9,6 +9,7 @@
 
   <PropertyGroup>
     <InstallFromSource>false</InstallFromSource>
+    <InstallLocation>/usr/local</InstallLocation>
   </PropertyGroup>
 
   <ItemGroup>

src/linux/Packaging.Linux/build.sh

@@ -40,6 +40,11 @@ case "$i" in
 esac
 done
 
+# Ensure install location exists
+if [! -d "$installLocation" ]; then
+    mkdir -p "$INSTALL_LOCATION"
+fi
+
 # Perform pre-execution checks
 CONFIGURATION="${CONFIGURATION:=Debug}"
 if [ -z "$VERSION" ]; then
@@ -54,10 +59,6 @@ SYMBOLS="$OUTDIR/payload.sym"
 "$INSTALLER_SRC/layout.sh" --configuration="$CONFIGURATION" || exit 1
 
 if [ $INSTALL_FROM_SOURCE = true ]; then
-    #INSTALL_LOCATION="/usr/local"
-
-    mkdir -p "$INSTALL_LOCATION"
-
     echo "Installing to $INSTALL_LOCATION"
 
     # Install directories

src/linux/Packaging.Linux/install-from-source.sh

@@ -6,7 +6,6 @@
 # for additional details.
 set -e
 
-installLocation=/usr/local
 is_ci=
 for i in "$@"; do
     case "$i" in
@@ -21,10 +20,14 @@ for i in "$@"; do
     esac
 done
 
+# If install-location is not passed, use default value
+if [ -z "$installLocation" ]; then
+    installLocation=/usr/local
+fi
 
-# If pass the install-location check if it exists
+# Ensure install location exists
 if [! -d "$installLocation" ]; then
-    echo "The folder $installLocation do not exists"
+    echo "The folder $installLocation does not exist"
     exit
 fi