From c268fa7c1e0543cba0e67efb8315c8403e09f502 Mon Sep 17 00:00:00 2001 From: Josh Date: Tue, 28 Mar 2023 17:16:50 -0700 Subject: [PATCH 1/4] add warning to modeler installer --- install/modeler/install_mac_modeler.sh | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/install/modeler/install_mac_modeler.sh b/install/modeler/install_mac_modeler.sh index 8de863ca..33f1a66f 100755 --- a/install/modeler/install_mac_modeler.sh +++ b/install/modeler/install_mac_modeler.sh @@ -1,9 +1,18 @@ #!/bin/bash +ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" + echo echo "Camunda Modeler Installer for Mac OS" echo +if [ ! -f "elements.json" ]; then + echo "*** WARNING *** : File 'elements.json' does not exists in ${ROOT} directory" + echo + echo "Run the Camunda Modeler Installer from 'modeler/' folder or copy elements.json to ${ROOT}" + echo +fi + if [ ! -d "/Applications" ]; then echo "Error: Cannot find '/Applications' directory. Is this a Mac OS machine?" echo "Exiting..." From fab25b5896c4d5fbc72ad9e1e89f2af93724bab9 Mon Sep 17 00:00:00 2001 From: Josh Date: Wed, 12 Apr 2023 13:26:55 -0700 Subject: [PATCH 2/4] added warning to linux modeler script --- install/modeler/install_linux_modeler.sh | 14 ++++++++++++++ install/modeler/install_mac_modeler.sh | 9 +++++++-- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/install/modeler/install_linux_modeler.sh b/install/modeler/install_linux_modeler.sh index 47541dac..7cf5bc59 100755 --- a/install/modeler/install_linux_modeler.sh +++ b/install/modeler/install_linux_modeler.sh @@ -1,5 +1,7 @@ #!/bin/bash +ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" + echo echo "Camunda Modeler Installer for Linux" echo @@ -7,6 +9,18 @@ echo "This will install the Camunda Modeler in this directory:" pwd echo +if [ ! -f "elements.json" ]; then + echo "****************************************" + echo "*************** WARNING ! **************" + echo "****************************************" + echo "+--------------------------------------+" + echo "File 'elements.json' does not exists in ${ROOT} directory " + echo "+--------------------------------------+" + echo + echo "Run the Camunda Modeler Installer from 'modeler/' folder or copy elements.json to ${ROOT} before continuing " + echo +fi + # Confirm Install while [[ ! $REPLY =~ ^(y|Y|n|N)$ ]]; do read -p "Press Y to continue or N to abort. (Y/N): " REPLY diff --git a/install/modeler/install_mac_modeler.sh b/install/modeler/install_mac_modeler.sh index 33f1a66f..6f292f88 100755 --- a/install/modeler/install_mac_modeler.sh +++ b/install/modeler/install_mac_modeler.sh @@ -7,9 +7,14 @@ echo "Camunda Modeler Installer for Mac OS" echo if [ ! -f "elements.json" ]; then - echo "*** WARNING *** : File 'elements.json' does not exists in ${ROOT} directory" + echo "****************************************" + echo "*************** WARNING ! **************" + echo "****************************************" + echo "+--------------------------------------+" + echo "File 'elements.json' does not exists in ${ROOT} directory " + echo "+--------------------------------------+" echo - echo "Run the Camunda Modeler Installer from 'modeler/' folder or copy elements.json to ${ROOT}" + echo "Run the Camunda Modeler Installer from 'modeler/' folder or copy elements.json to ${ROOT} before continuing " echo fi From 6eabc906d4c6fb10f750f6aada4a39a6fadf793e Mon Sep 17 00:00:00 2001 From: Josh Date: Mon, 24 Apr 2023 12:21:38 -0700 Subject: [PATCH 3/4] add exit when elements JSON is missing --- install/modeler/install_linux_modeler.sh | 5 +++-- install/modeler/install_mac_modeler.sh | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/install/modeler/install_linux_modeler.sh b/install/modeler/install_linux_modeler.sh index 7de990d5..8b840bd8 100755 --- a/install/modeler/install_linux_modeler.sh +++ b/install/modeler/install_linux_modeler.sh @@ -17,8 +17,9 @@ if [ ! -f "elements.json" ]; then echo "File 'elements.json' does not exists in ${ROOT} directory " echo "+--------------------------------------+" echo - echo "Run the Camunda Modeler Installer from 'modeler/' folder or copy elements.json to ${ROOT} before continuing " - echo + echo "Run the Camunda Modeler Installer from 'modeler/' folder or copy elements.json to '${ROOT}' before running modeler script " + echo Aborting... + exit 1 fi # Confirm Install diff --git a/install/modeler/install_mac_modeler.sh b/install/modeler/install_mac_modeler.sh index 72ef3b6a..fa335dc5 100755 --- a/install/modeler/install_mac_modeler.sh +++ b/install/modeler/install_mac_modeler.sh @@ -14,8 +14,9 @@ if [ ! -f "elements.json" ]; then echo "File 'elements.json' does not exists in ${ROOT} directory " echo "+--------------------------------------+" echo - echo "Run the Camunda Modeler Installer from 'modeler/' folder or copy elements.json to ${ROOT} before continuing " - echo + echo "Run the Camunda Modeler Installer from 'modeler/' folder or copy elements.json to '${ROOT}' before running modeler script " + echo Aborting... + exit 1 fi if [ ! -d "/Applications" ]; then From dcc747eb61c4f84ba62cb57e1e90df59b4648423 Mon Sep 17 00:00:00 2001 From: Josh Date: Mon, 24 Apr 2023 12:25:17 -0700 Subject: [PATCH 4/4] exiting echo --- install/modeler/install_linux_modeler.sh | 2 +- install/modeler/install_mac_modeler.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/install/modeler/install_linux_modeler.sh b/install/modeler/install_linux_modeler.sh index 8b840bd8..95949b3c 100755 --- a/install/modeler/install_linux_modeler.sh +++ b/install/modeler/install_linux_modeler.sh @@ -18,7 +18,7 @@ if [ ! -f "elements.json" ]; then echo "+--------------------------------------+" echo echo "Run the Camunda Modeler Installer from 'modeler/' folder or copy elements.json to '${ROOT}' before running modeler script " - echo Aborting... + echo "Exiting..." exit 1 fi diff --git a/install/modeler/install_mac_modeler.sh b/install/modeler/install_mac_modeler.sh index fa335dc5..54012b20 100755 --- a/install/modeler/install_mac_modeler.sh +++ b/install/modeler/install_mac_modeler.sh @@ -15,7 +15,7 @@ if [ ! -f "elements.json" ]; then echo "+--------------------------------------+" echo echo "Run the Camunda Modeler Installer from 'modeler/' folder or copy elements.json to '${ROOT}' before running modeler script " - echo Aborting... + echo "Exiting..." exit 1 fi