Merge pull request #23 from MattSurabian/sudoless-install

Sudoless install

install.sh

@@ -12,6 +12,7 @@ systemInstallPath="/usr/local/bin";
 executableSystemInstallPath="$systemInstallPath/$executableFileName";
 CREDS_FILE="login.conf";
 systemCredsFilePath="$CONF_BASE_PATH/$CREDS_FILE";
+configOnly="false"
 
 # Source: https://gist.github.com/hoylen/6607180
 PROG="$(basename "$0")";
@@ -22,16 +23,20 @@ VERSION="0.2";
 
 HELP_TEXT="Usage: $PROG [options]
 Options:
-  -f | --force        Allow overwriting existing files on system if they already exist.  Useful for at least updating login info, and for also restoring program defaults.
-  -s | --symlink      Install the main program executable as a link to the original contained within this project, rather than copying it over into the system directory.  This may allow for simply updating the main project via source control, but be aware that changing its location may break the symlink, and would require re-installation.
-  -h | --help         show this help message";
+  -f | --force          Allow overwriting existing files on system if they already exist.  Useful for at least updating login info, and for also restoring program defaults.
+  -s | --symlink        Install the main program executable as a link to the original contained within this project, rather than copying it over into the system directory.  This may allow for simply updating the main project via source control, but be aware that changing its location may break the symlink, and would require re-installation.
+  -c | --configuration  Skip adding the script to the user's PATH and just create proxpn configuration files.
+  -h | --help           show this help message";
 
 while [ $# -gt 0 ]; do
     case "$1" in
         -h | --help)
           echo "$HELP_TEXT";
           exit 0;
           ;;
+        -c | --configuration)
+          configOnly="true"
+          ;;
         -s | --symlink)
           symlinkToMainExecutable="true";
           ;;
@@ -46,6 +51,13 @@ while [ $# -gt 0 ]; do
     shift
 done
 
+if [ $EUID != 0 -a $configOnly != true ]; then
+  echo "This script must be run as root in order to copy the script to $systemInstallPath."
+  echo "Falling back to configuration only mode. You must re-run this script with sudo or manually copy the proxpn script into your PATH before using the proxpn command."
+  echo
+  configOnly="true"
+fi
+
 [[ -z "$overwriteFiles" ]] && overwriteFiles="false";
 [[ -z "$symlinkToMainExecutable" ]] && symlinkToMainExecutable="false";
 
@@ -74,6 +86,8 @@ fi
 ## Install system-wide program link, if not already installed.
 if [[ -f "$executableSystemInstallPath" && ! "$overwriteFiles" == "true" ]]; then
   echo "System-wide program link already exists; continuing installation...";
+elif [ $configOnly == "true" ]; then
+  echo "Operating in configuration only mode. Skipping system-wide progam linking..."
 elif [[ -f "$executableFilePath" ]]; then
   if [[ -f "$executableSystemInstallPath" ]]; then
     rm "$executableSystemInstallPath";