From a82dd2a1c031e749ad2a936ae0730acfc6767198 Mon Sep 17 00:00:00 2001
From: Ceda EI <ceda_ei@webionite.com>
Date: Wed, 21 Oct 2020 19:00:56 +0530
Subject: [PATCH] Fix argument parsing. Add -n allowing new profile

---
 setup.sh | 78 +++++++++++++++++++++++++++++++++++++++-----------------
 1 file changed, 54 insertions(+), 24 deletions(-)

diff --git a/setup.sh b/setup.sh
index d43906f..e1544ff 100755
--- a/setup.sh
+++ b/setup.sh
@@ -3,27 +3,33 @@
 
 set -euo pipefail
 
-if pidof firefox &> /dev/null; then
-	echo "It is recommended to close firefox before running this script."
-	echo -n "Do you want to run the script anyways? (y/N): "
-	read -r input
-	if [[ ${input^^} != "Y" ]]; then
-		exit 2
-	fi
-fi
-
-
-
 REPO_DIR="$(dirname "$0")"
 BIN_DIR="$REPO_DIR/bin"
 ICON_DIR="$REPO_DIR/icon"
+FIRST_LAUNCH="https://gitlab.com/ceda_ei/firefox-web-apps/-/wikis/Getting-Started"
+HELP_TEXT="
+Usage:
+ $0 [-f|--firefox-profile] <firefox_profile> [-n|--new] <profile_name> [-h|--help]
+
+Configure a firefox profile for web apps.
+
+Options:
+ -f, --firefox-profile         Path to an existing firefox profile (unless -n is
+     <firefox_profile>         also provided)
+ -n, --new <profile_name>      Creates a new profile with the given name. -f
+                               configures the new profile path when passed along
+                               with -n
+ -h, --help                    This help page
+"
 
 [[ -d $BIN_DIR ]] || mkdir -- "$BIN_DIR"
 [[ -d $ICON_DIR ]] || mkdir -- "$ICON_DIR"
 
 FIREFOX_PROFILE=""
-OPTIONS=f
-LONGOPTS=firefox-profile
+PROFILE_NAME="firefox-web-apps"
+NEW=0
+OPTIONS=f:n:h
+LONGOPTS=firefox-profile:,new:,help
 PARSED=$(getopt --options=$OPTIONS --longoptions=$LONGOPTS --name "$0" -- "$@")
 eval set -- "$PARSED"
 
@@ -32,8 +38,18 @@ while true; do
 		-f|--firefox-profile)
 			shift
 			FIREFOX_PROFILE="$1"
+			shift
+			;;
+		-n|--new)
+			NEW=1
+			shift
+			PROFILE_NAME="$1"
+			shift
+			;;
+		-h|--help)
+			echo "$HELP_TEXT"
+			exit
 			;;
-
 		--)
 			break
 			;;
@@ -43,16 +59,30 @@ while true; do
 	esac
 done
 
-
-# Prompt to create Firefox profile
-if [[ $FIREFOX_PROFILE == "" ]]; then
-	echo -n "Use an existing profile for apps? (y/N): "
+# Check if firefox is running
+if pidof firefox &> /dev/null; then
+	echo "It is recommended to close firefox before running this script."
+	echo -n "Do you want to run the script anyways? (y/N): "
 	read -r input
-	if [[ ${input^^} == "Y" ]]; then
-		echo "Enter path to existing profile (or run the script with --firefox_profile): "
-		read -r FIREFOX_PROFILE
-	else
-		FIREFOX_PROFILE="$HOME/.mozilla/firefox/firefox-web-apps"
-		firefox -CreateProfile "firefox-web-apps ${FIREFOX_PROFILE}"
+	if [[ ${input^^} != "Y" ]]; then
+		exit 2
+	fi
+fi
+
+# Prompt to create Firefox profile
+if [[ $FIREFOX_PROFILE == "" ]] || (( NEW == 1 )); then
+	if (( NEW == 0 )); then
+		echo -n "Use an existing profile for apps? (y/N): "
+		read -r input
+		if [[ ${input^^} == "Y" ]]; then
+			echo "Enter path to existing profile (or run the script with --firefox_profile): "
+			read -r FIREFOX_PROFILE
+		else
+			NEW=1
+		fi
+	fi
+	if (( NEW == 1 )); then
+		FIREFOX_PROFILE="${FIREFOX_PROFILE:-$HOME/.mozilla/firefox/${PROFILE_NAME}}"
+		firefox -CreateProfile "${PROFILE_NAME} ${FIREFOX_PROFILE}"
 	fi
 fi