diff --git a/installation/scripts/install_application_from_zip.sh b/installation/scripts/install_application_from_zip.sh index 35569a94a45ef0b6f2d3b5d269100abe4ddc088b..b7820a8b6ea3fd9325c62a19a9beae1cb4b8309e 100644 --- a/installation/scripts/install_application_from_zip.sh +++ b/installation/scripts/install_application_from_zip.sh @@ -6,12 +6,12 @@ usage() { echo "If specifying a .asc verification file (with -v flag), the program will attempt to create a temp folder in the working directory and verify the signature with gpg." 1>&2 } -APPLICATION_NAME = "autopsy"; +APPLICATION_NAME="autopsy"; while getopts "n:z:i:j:v:" o; do case "${o}" in n) - APPLICATION_NAME = ${OPTARG} + APPLICATION_NAME=${OPTARG} ;; z) APPLICATION_ZIP_PATH=${OPTARG} @@ -55,7 +55,7 @@ fi ZIP_FILE_NAME=$(basename -- "$APPLICATION_ZIP_PATH") ZIP_NAME="${ZIP_FILE_NAME%.*}" -APPLICATION_EXTRACTED_PATH=$INSTALL_DIR/$ZIP_NAME +APPLICATION_EXTRACTED_PATH=$INSTALL_DIR/$ZIP_NAME/ if [[ -d $APPLICATION_EXTRACTED_PATH || -f $APPLICATION_EXTRACTED_PATH ]]; then echo "A file or directory already exists at $APPLICATION_EXTRACTED_PATH" >>/dev/stderr diff --git a/unix_setup.sh b/unix_setup.sh index a1e570dcff344071bd5adcdcb83b9d94d8053e3d..cd29169b4ac2c3488ed65c02428de011aa41a181 100644 --- a/unix_setup.sh +++ b/unix_setup.sh @@ -12,12 +12,12 @@ usage() { echo "Usage: unix_setup.sh [-j java_home] [-n application_name]" 1>&2; } -APPLICATION_NAME = "autopsy"; +APPLICATION_NAME="autopsy"; while getopts "j:n:" o; do case "${o}" in n) - APPLICATION_NAME = ${OPTARG} + APPLICATION_NAME=${OPTARG} ;; j) JAVA_PATH=${OPTARG} @@ -52,8 +52,9 @@ fi echo -n "Checking for Java..." if [ -n "$JAVA_PATH" ]; then if [ -x "$JAVA_PATH/bin/java" ]; then - sed -Ei '/^#?\s*jdkhome=/d' etc/$(APPLICATION_NAME).conf - echo "jdkhome=$JAVA_PATH" >> etc/$(APPLICATION_NAME).conf + # only works on linux; not os x + sed -Ei '/^#?\s*jdkhome=.*$' "etc/$APPLICATION_NAME.conf" + echo "jdkhome=$JAVA_PATH" >> etc/$APPLICATION_NAME.conf else echo "ERROR: Java was not found in $JAVA_PATH." exit 1