update core scripts to restart aem after deploy

Author: wildone

aemdesign-aem-services/deploy

@@ -6,58 +6,16 @@ SCRIPT_PARAMS="$@"
 
 source "../scripts/functions.sh"
 
-set_term_title "Get Project Version"
-
-PROJECT_VERSION=$(getParamOrDefault "$SCRIPT_PARAMS" "version")
-PROJECT_ARTIFACTID=$(cat "./pom.xml" | grep artifactId | head -n 2 | tail -n 1 | sed -e 's/.*>\(.*\)<.*/\1/')
-GIT_VERSION=$(getCurrentProjectVersion)
-
-
-echo "Current Project Version: $PROJECT_VERSION"
-echo "Current Git Version: $GIT_VERSION"
-echo "Project Artifact Id Version: $PROJECT_ARTIFACTID"
-
-PROJECT_JAR="/apps/aemdesign/install/${PROJECT_ARTIFACTID}-${GIT_VERSION}.jar"
-echo "Project Jar: $PROJECT_JAR"
-
-JAR_EXIST=$(doCheckPathExist "$PROJECT_JAR")
-
-echo "Check if Jar exists: $JAR_EXIST"
-
-SKIP_RESTART="false"
-
-#if [[ "false" == "$JAR_EXIST" ]]; then
-#    SKIP_RESTART="true"
-#fi
-
-echo "Skip restart: $SKIP_RESTART"
-
-if [[ "false" == "$SKIP_RESTART" ]]; then
-    echo "Delete Current Jar: ${PROJECT_JAR}"
-    doDeletePath "${PROJECT_JAR}"
-    set_term_title "Services Deploy"
-fi
-
+#try to delete existing jar
+delete_current_jar
 
 echo "- Deploy"
 mvn -Dvault.useProxy=false -DskipTests clean deploy -P autoInstallBundle -Dmaven.deploy.skip=true -DskipNexusStagingDeployMojo=true "$@"
 echo "- Deployed"
 
-if [[ "false" == "$SKIP_RESTART" ]]; then
-    AEM_CONTAINER_NAME=$(getContainerNameByPort "$AEM_PORT")
-    echo "Restarting AEM Docker Container: ${AEM_CONTAINER_NAME}"
-    doRestartContainerUsingPort "$AEM_PORT"
-    #doPostFields "/system/console/vmstat" "-F shutdown_type=Restart"
-fi
-
-
+#restart aem container
+restart_aem_docker
 
-set_term_title "Wait for AEM Ready"
-echo "Waiting for AEM to be ready"
-doWaitForStartup
-doWaitForPackageManagerStartup
-doWaitForBundlesToInstall
 
-echo "AEM is ready!"
+set_term_title "Deploy Done"
 
-set_term_title "Deploy Done"

scripts/functions-aem.sh

@@ -1,7 +1,11 @@
 #!/bin/bash
 
 CURL=$(/usr/bin/which curl)
+CAT=$(/usr/bin/which cat)
 GREP=$(/usr/bin/which grep)
+HEAD=$(/usr/bin/which head)
+TAIL=$(/usr/bin/which tail)
+SED=$(/usr/bin/which sed)
 
 SERVER_ADDRESS="${AEM_SCHEMA}://${AEM_HOST}:${AEM_PORT}"
 LOGIN_DEFAULT="${AEM_USER}:${AEM_PASS}"
@@ -120,4 +124,50 @@ function doCheckPathExist() {
 
     doGetCheck "${AEM_USER}:${AEM_PASS}" "${AEM_SCHEMA}://${AEM_HOST}:${AEM_PORT}" "${PATH}"
 
+}
+
+function restart_aem_docker() {
+    if [[ "false" == "$SKIP_RESTART" ]]; then
+        AEM_CONTAINER_NAME=$(getContainerNameByPort "$AEM_PORT")
+        echo "Restarting AEM Docker Container: ${AEM_CONTAINER_NAME}"
+        doRestartContainerUsingPort "$AEM_PORT"
+        #doPostFields "/system/console/vmstat" "-F shutdown_type=Restart"
+    fi
+
+
+
+    set_term_title "Wait for AEM Ready"
+    echo "Waiting for AEM to be ready"
+    doWaitForStartup
+    doWaitForPackageManagerStartup
+    doWaitForBundlesToInstall
+
+    echo "AEM is ready!"
+
+}
+
+
+function delete_current_jar() {
+
+    set_term_title "Get Project Version"
+
+    PROJECT_VERSION=$(getParamOrDefault "" "version")
+    PROJECT_ARTIFACTID=$($CAT "./pom.xml" | $GREP artifactId | $HEAD -n 2 | $TAIL -n 1 | $SED -e 's/.*>\(.*\)<.*/\1/')
+    GIT_VERSION=$(getCurrentProjectVersion)
+
+    echo "Current Project Version: $PROJECT_VERSION"
+    echo "Current Git Version: $GIT_VERSION"
+    echo "Project Artifact Id Version: $PROJECT_ARTIFACTID"
+
+    PROJECT_JAR="/apps/aemdesign/install/${PROJECT_ARTIFACTID}-${GIT_VERSION}.jar"
+    echo "Project Jar: $PROJECT_JAR"
+
+    JAR_EXIST=$(doCheckPathExist "$PROJECT_JAR")
+
+    echo "Check if Jar exists: $JAR_EXIST"
+
+    echo "Delete Current Jar: ${PROJECT_JAR}"
+    doDeletePath "${PROJECT_JAR}"
+    set_term_title "Services Deploy"
+
 }

scripts/functions.sh

@@ -14,14 +14,15 @@ FIND=$(/usr/bin/which find)
 CURL=$(/usr/bin/which curl)
 SLEEP=$(/usr/bin/which sleep)
 SH=$(/usr/bin/which sh)
+SED=$(/usr/bin/which sed)
 
 source "$SCRIPTS_PARENT/functions-common.sh"
 source "$SCRIPTS_PARENT/functions-debug.sh"
 source "$SCRIPTS_PARENT/functions-maven.sh"
 source "$SCRIPTS_PARENT/functions-curl.sh"
-source "$SCRIPTS_PARENT/functions-aem.sh"
 source "$SCRIPTS_PARENT/functions-git.sh"
 source "$SCRIPTS_PARENT/functions-docker.sh"
+source "$SCRIPTS_PARENT/functions-aem.sh"