From cb9a459272183b0dd5ea01cf03b5605575822c27 Mon Sep 17 00:00:00 2001 From: mikepsinn Date: Wed, 7 Jul 2021 20:25:54 -0500 Subject: [PATCH 01/11] writeToFile qmLog.debug("Writing to " + filePath) --- modules/qmLog.js | 2 +- src/js/qmHelpers.js | 6 ++++-- ts/qm.file-helper.ts | 4 ++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/modules/qmLog.js b/modules/qmLog.js index 2d82be72c3..63e6abe92a 100644 --- a/modules/qmLog.js +++ b/modules/qmLog.js @@ -229,7 +229,7 @@ var qmLog = { if(!stringContents || stringContents === "undefined" || stringContents === "null"){ throw "String contents are " + stringContents; } - qmLog.info("Writing to " + filePath); + qmLog.debug("Writing to " + filePath); if(typeof stringContents !== "string"){stringContents = qmLog.prettyJSONStringify(stringContents);} return fs.writeFileSync(filePath, stringContents); } diff --git a/src/js/qmHelpers.js b/src/js/qmHelpers.js index 3326b066f3..33460fcd68 100644 --- a/src/js/qmHelpers.js +++ b/src/js/qmHelpers.js @@ -3,6 +3,8 @@ /** @namespace qm.chrome */ /* global AppSettings TweenMax, Power1, Sine, Linear, Power3, TimelineMax, Power2 */ /* eslint-env browser */ +import * as qmLog from "../../ts/qm.log"; + String.prototype.toCamelCase = function(){ return this.replace(/(\_[a-z])/g, function($1){ return $1.toUpperCase().replace('_', ''); @@ -4188,7 +4190,7 @@ var qm = { if(!stringContents){ throw filePath + " stringContents not provided to writeToFileWithCallback"; } - qmLog.info("Writing to " + filePath); + qmLog.debug("Writing to " + filePath); if(typeof stringContents !== "string"){ stringContents = JSON.stringify(stringContents); } @@ -4203,7 +4205,7 @@ var qm = { return rimraf(filesArray, cb); }, writeFileSync: function(filePath, stringContents){ - qmLog.info("Writing to " + filePath); + qmLog.debug("Writing to " + filePath); if(typeof stringContents !== "string"){ stringContents = qm.stringHelper.prettyJSONStringify(stringContents); } diff --git a/ts/qm.file-helper.ts b/ts/qm.file-helper.ts index 45b40003e7..c1c6c97813 100644 --- a/ts/qm.file-helper.ts +++ b/ts/qm.file-helper.ts @@ -146,13 +146,13 @@ export function writeToFile(filePath: string, contents: any) { const absolutePath = getAbsolutePath(filePath) ensureDirectoryExistence(absolutePath) - console.log("Writing to " + absolutePath) + qmLog.debug("Writing to " + absolutePath) fs.writeFile(absolutePath, contents, (err) => { if (err) { deferred.reject(err) } // tslint:disable-next-line:no-console - console.log(absolutePath + "\n\tsaved!") + qmLog.debug(absolutePath + "\n\tsaved!") deferred.resolve(absolutePath) }) return deferred.promise From f3249a2a8cae5e58b0731248b673d6341d38e355 Mon Sep 17 00:00:00 2001 From: mikepsinn Date: Wed, 7 Jul 2021 20:27:28 -0500 Subject: [PATCH 02/11] qmLog.logEndOfProcess("runCypressTests") --- cypress/cypress-functions.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cypress/cypress-functions.ts b/cypress/cypress-functions.ts index 202f8b6341..c9864eaf5d 100644 --- a/cypress/cypress-functions.ts +++ b/cypress/cypress-functions.ts @@ -380,9 +380,9 @@ export function runCypressTests(cb?: (err: any) => void) { if (cb) { cb(false) } + qmLog.logEndOfProcess("runCypressTests") }) } - qmLog.logEndOfProcess("runCypressTests") resolve() }) })) From c793a9bef833698a5529b4cca6cf2a9386b78942 Mon Sep 17 00:00:00 2001 From: mikepsinn Date: Wed, 7 Jul 2021 20:28:08 -0500 Subject: [PATCH 03/11] qmLog.logEndOfProcess("runCypressTests") --- cypress/cypress-functions.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/cypress/cypress-functions.ts b/cypress/cypress-functions.ts index c9864eaf5d..d2c2a35b3a 100644 --- a/cypress/cypress-functions.ts +++ b/cypress/cypress-functions.ts @@ -362,6 +362,7 @@ export function runCypressTests(cb?: (err: any) => void) { const specsPath = getSpecsPath() fs.readdir(specsPath, function(err: any, specFileNames: string[]) { if (!specFileNames) { + qmLog.logEndOfProcess("runCypressTests") throw new Error("No specFileNames in " + specsPath) } for (let i = 0, p = Promise.resolve(); i < specFileNames.length; i++) { From 0e37c925f55d451f826f0280dc47a21bfc61a4d2 Mon Sep 17 00:00:00 2001 From: mikepsinn Date: Wed, 7 Jul 2021 20:32:00 -0500 Subject: [PATCH 04/11] nvm_install.sh --- scripts/install.sh | 1 + scripts/nvm_install.sh | 14 +++++++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/scripts/install.sh b/scripts/install.sh index 532243ae16..cac5270995 100644 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -1,6 +1,7 @@ #!/bin/bash # shellcheck disable=SC2006 # shellcheck disable=SC2086 +set +x PARENT_SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/$(basename "${BASH_SOURCE[0]}")" && SCRIPT_FOLDER=`dirname ${PARENT_SCRIPT_PATH}` echo "SCRIPT_FOLDER is $SCRIPT_FOLDER" && cd "${SCRIPT_FOLDER}" && cd .. && export IONIC_PATH="$PWD" && echo "IONIC_PATH is $IONIC_PATH" # shellcheck source=./log_start.sh diff --git a/scripts/nvm_install.sh b/scripts/nvm_install.sh index 0c3a319be5..d537a04e1c 100644 --- a/scripts/nvm_install.sh +++ b/scripts/nvm_install.sh @@ -1,7 +1,15 @@ #!/usr/bin/env bash +set +x +PARENT_SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/$(basename "${BASH_SOURCE[0]}")" && SCRIPT_FOLDER=$(dirname "${PARENT_SCRIPT_PATH}") +echo "SCRIPT_FOLDER is $SCRIPT_FOLDER" && cd "${SCRIPT_FOLDER}" && cd .. && export IONIC_PATH="$PWD" && echo "IONIC_PATH is $IONIC_PATH" -sudo apt-get update -sudo apt-get install build-essential libssl-dev -curl https://raw.githubusercontent.com/creationix/nvm/v0.25.0/install.sh | bash +set -x +sudo chown -R "$USER" ~/.nvm || true +curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.38.0/install.sh | bash +set +x +export NVM_DIR="$([ -z "${XDG_CONFIG_HOME-}" ] && printf %s "${HOME}/.nvm" || printf %s "${XDG_CONFIG_HOME}/nvm")" +[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm echo "You'll probably have to restart the script to use nvm" +# shellcheck source=./log_start.sh +source "$IONIC_PATH"/scripts/log_end.sh "${BASH_SOURCE[0]}" From 4f62fe9784ab4ca9dbce0ef4039e0f98195d3e48 Mon Sep 17 00:00:00 2001 From: mikepsinn Date: Wed, 7 Jul 2021 20:58:36 -0500 Subject: [PATCH 05/11] nvm_install.sh --- scripts/nvm.sh | 13 +++++-------- scripts/nvm_install.sh | 11 +++++------ scripts/nvm_load.sh | 7 +++++++ 3 files changed, 17 insertions(+), 14 deletions(-) create mode 100644 scripts/nvm_load.sh diff --git a/scripts/nvm.sh b/scripts/nvm.sh index 2cd477cb7f..f0ad855060 100644 --- a/scripts/nvm.sh +++ b/scripts/nvm.sh @@ -3,17 +3,14 @@ # shellcheck disable=SC2006 PARENT_SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/$(basename "${BASH_SOURCE[0]}")" && SCRIPT_FOLDER=`dirname ${PARENT_SCRIPT_PATH}` echo "SCRIPT_FOLDER is $SCRIPT_FOLDER" && cd "${SCRIPT_FOLDER}" && cd .. && export IONIC_PATH="$PWD" && echo "IONIC_PATH is $IONIC_PATH" +# shellcheck source=./no-root.sh source "$SCRIPT_FOLDER"/no-root.sh set +x sudo chown -R $USER ~/.nvm command -v nvm >/dev/null 2>&1 || { echo >&2 "nvm is required, but it's not installed. Trying to install it now..."; - echo "Installing curl..." - sudo apt install -y curl - echo "Installing nvm..." - curl https://raw.githubusercontent.com/creationix/nvm/master/install.sh | bash; - echo "Loading nvm command for shell access..." - # shellcheck disable=SC2155 - export NVM_DIR="$([ -z "${XDG_CONFIG_HOME-}" ] && printf %s "${HOME}/.nvm" || printf %s "${XDG_CONFIG_HOME}/nvm")"; - [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm + # shellcheck source=./nvm_load.sh + source "$IONIC_PATH"/scripts/install.sh } +# shellcheck source=./nvm_load.sh +source "$IONIC_PATH"/scripts/nvm_load.sh diff --git a/scripts/nvm_install.sh b/scripts/nvm_install.sh index d537a04e1c..2a0fcd3603 100644 --- a/scripts/nvm_install.sh +++ b/scripts/nvm_install.sh @@ -2,14 +2,13 @@ set +x PARENT_SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/$(basename "${BASH_SOURCE[0]}")" && SCRIPT_FOLDER=$(dirname "${PARENT_SCRIPT_PATH}") echo "SCRIPT_FOLDER is $SCRIPT_FOLDER" && cd "${SCRIPT_FOLDER}" && cd .. && export IONIC_PATH="$PWD" && echo "IONIC_PATH is $IONIC_PATH" - set -x sudo chown -R "$USER" ~/.nvm || true -curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.38.0/install.sh | bash -set +x -export NVM_DIR="$([ -z "${XDG_CONFIG_HOME-}" ] && printf %s "${HOME}/.nvm" || printf %s "${XDG_CONFIG_HOME}/nvm")" -[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm - +sudo apt install -y curl +echo "Installing nvm..." +curl https://raw.githubusercontent.com/creationix/nvm/master/install.sh | bash; +# shellcheck source=./nvm_load.sh +source "$IONIC_PATH"/scripts/nvm_load.sh echo "You'll probably have to restart the script to use nvm" # shellcheck source=./log_start.sh source "$IONIC_PATH"/scripts/log_end.sh "${BASH_SOURCE[0]}" diff --git a/scripts/nvm_load.sh b/scripts/nvm_load.sh new file mode 100644 index 0000000000..a993212ed9 --- /dev/null +++ b/scripts/nvm_load.sh @@ -0,0 +1,7 @@ +#!/bin/bash + +echo "Loading nvm command for shell access..." +# shellcheck disable=SC2155 +export NVM_DIR="$([ -z "${XDG_CONFIG_HOME-}" ] && printf %s "${HOME}/.nvm" || printf %s "${XDG_CONFIG_HOME}/nvm")" +# shellcheck disable=SC1090 +[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm From 760c8557f99b2bf43b4debcf326639a5598b033e Mon Sep 17 00:00:00 2001 From: mikepsinn Date: Wed, 7 Jul 2021 21:01:26 -0500 Subject: [PATCH 06/11] source "$SCRIPT_FOLDER"/nvm.sh --- scripts/install.sh | 10 ++-------- scripts/nvm.sh | 7 +++++++ 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/scripts/install.sh b/scripts/install.sh index cac5270995..d88c94118f 100644 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -10,14 +10,8 @@ set -e set -x # shellcheck source=./no-root.sh source "$SCRIPT_FOLDER"/no-root.sh -sudo chown -R $USER ~/.nvm || true -set +x -echo "nvm install 10..." -nvm install 10 -echo "nvm use 10..." -nvm use 10 -set -x -node -v +# shellcheck source=./nvm.sh +source "$SCRIPT_FOLDER"/nvm.sh npm install if [[ ${NODE_NAME} = "sonicmaster-ubuntu" ]]; then diff --git a/scripts/nvm.sh b/scripts/nvm.sh index f0ad855060..bf1fbbc091 100644 --- a/scripts/nvm.sh +++ b/scripts/nvm.sh @@ -14,3 +14,10 @@ command -v nvm >/dev/null 2>&1 || { } # shellcheck source=./nvm_load.sh source "$IONIC_PATH"/scripts/nvm_load.sh +set +x +echo "nvm install 10..." +nvm install 10 +echo "nvm use 10..." +nvm use 10 +set -x +node -v From 7ffba528a86ce3a2d895124cc73eaa70618ddb08 Mon Sep 17 00:00:00 2001 From: mikepsinn Date: Wed, 7 Jul 2021 21:02:12 -0500 Subject: [PATCH 07/11] source "$SCRIPT_FOLDER"/nvm.sh 10 --- scripts/install.sh | 2 +- scripts/nvm.sh | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/install.sh b/scripts/install.sh index d88c94118f..337e7e3f40 100644 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -11,7 +11,7 @@ set -x # shellcheck source=./no-root.sh source "$SCRIPT_FOLDER"/no-root.sh # shellcheck source=./nvm.sh -source "$SCRIPT_FOLDER"/nvm.sh +source "$SCRIPT_FOLDER"/nvm.sh 10 npm install if [[ ${NODE_NAME} = "sonicmaster-ubuntu" ]]; then diff --git a/scripts/nvm.sh b/scripts/nvm.sh index bf1fbbc091..43f1578ebd 100644 --- a/scripts/nvm.sh +++ b/scripts/nvm.sh @@ -15,9 +15,9 @@ command -v nvm >/dev/null 2>&1 || { # shellcheck source=./nvm_load.sh source "$IONIC_PATH"/scripts/nvm_load.sh set +x -echo "nvm install 10..." -nvm install 10 -echo "nvm use 10..." -nvm use 10 +echo "nvm install $1..." +nvm install $1 +echo "nvm use $1..." +nvm use $1 set -x node -v From 5c1daead96a287a364d0b404c256d046d0784d84 Mon Sep 17 00:00:00 2001 From: mikepsinn Date: Wed, 7 Jul 2021 21:03:00 -0500 Subject: [PATCH 08/11] nvm_install.sh --- scripts/nvm.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/nvm.sh b/scripts/nvm.sh index 43f1578ebd..fd4d876049 100644 --- a/scripts/nvm.sh +++ b/scripts/nvm.sh @@ -10,7 +10,7 @@ sudo chown -R $USER ~/.nvm command -v nvm >/dev/null 2>&1 || { echo >&2 "nvm is required, but it's not installed. Trying to install it now..."; # shellcheck source=./nvm_load.sh - source "$IONIC_PATH"/scripts/install.sh + source "$IONIC_PATH"/scripts/nvm_install.sh } # shellcheck source=./nvm_load.sh source "$IONIC_PATH"/scripts/nvm_load.sh From 5931145451580bda34302321118f1567c9f7a506 Mon Sep 17 00:00:00 2001 From: mikepsinn Date: Wed, 7 Jul 2021 21:03:44 -0500 Subject: [PATCH 09/11] set +x --- scripts/nvm_load.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/nvm_load.sh b/scripts/nvm_load.sh index a993212ed9..10115eb668 100644 --- a/scripts/nvm_load.sh +++ b/scripts/nvm_load.sh @@ -1,5 +1,5 @@ #!/bin/bash - +set +x echo "Loading nvm command for shell access..." # shellcheck disable=SC2155 export NVM_DIR="$([ -z "${XDG_CONFIG_HOME-}" ] && printf %s "${HOME}/.nvm" || printf %s "${XDG_CONFIG_HOME}/nvm")" From c5f99f7a357ce816755f4caf50d1b62490be0937 Mon Sep 17 00:00:00 2001 From: mikepsinn Date: Wed, 7 Jul 2021 21:21:04 -0500 Subject: [PATCH 10/11] source "$IONIC_PATH"/scripts/log_start.sh "${BASH_SOURCE[0]}" --- scripts/build_all_apps.sh | 13 ++++++++----- scripts/build_scripts/prepare_quantimodo.sh | 13 +++++++++---- scripts/commit-build.sh | 8 ++++++-- scripts/cypress_run.sh | 5 +++-- scripts/ghost-inspector.sh | 4 ++-- scripts/heroku.sh | 5 +++-- scripts/install.sh | 8 +++----- scripts/ionic_install_with_dependencies.sh | 17 +++++++++++------ scripts/mocha.sh | 6 ++++-- scripts/no-root.sh | 1 + scripts/nvm.sh | 7 +++++-- scripts/nvm_install.sh | 3 ++- scripts/test.sh | 6 ++++-- 13 files changed, 61 insertions(+), 35 deletions(-) diff --git a/scripts/build_all_apps.sh b/scripts/build_all_apps.sh index b58f99d73a..c0efaed6d4 100644 --- a/scripts/build_all_apps.sh +++ b/scripts/build_all_apps.sh @@ -1,16 +1,17 @@ #!/bin/bash - +set +x +set -e export RED='\033[0;31m' export GREEN='\033[0;32m' export NC='\033[0m' # No Color PARENT_SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/$(basename "${BASH_SOURCE[0]}")" -SCRIPT_FOLDER=`dirname ${PARENT_SCRIPT_PATH}` +SCRIPT_FOLDER=$(dirname "${PARENT_SCRIPT_PATH}") echo "SCRIPT_FOLDER is $SCRIPT_FOLDER" -cd ${SCRIPT_FOLDER} +cd "${SCRIPT_FOLDER}" cd .. -export IONIC_PATH="$PWD" -echo "IONIC_PATH is $IONIC_PATH" +# shellcheck source=./log_start.sh +export IONIC_PATH="$PWD" && source "$IONIC_PATH"/scripts/log_start.sh #cd .. #mkdir qm-ionic-intermediates @@ -318,4 +319,6 @@ fi sudo chmod -R 777 ${DROPBOX_PATH}/QuantiModo/apps +# shellcheck source=./log_start.sh +source "$IONIC_PATH"/scripts/log_end.sh "${BASH_SOURCE[0]}" exit 0 diff --git a/scripts/build_scripts/prepare_quantimodo.sh b/scripts/build_scripts/prepare_quantimodo.sh index 6bfe0636a1..4f063c5156 100644 --- a/scripts/build_scripts/prepare_quantimodo.sh +++ b/scripts/build_scripts/prepare_quantimodo.sh @@ -1,15 +1,17 @@ #!/usr/bin/env bash - +set +x +set -e export RED='\033[0;31m' export GREEN='\033[0;32m' export NC='\033[0m' # No Color PARENT_SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/$(basename "${BASH_SOURCE[0]}")" -SCRIPT_FOLDER=`dirname ${PARENT_SCRIPT_PATH}` +SCRIPT_FOLDER=$(dirname "${PARENT_SCRIPT_PATH}") echo "SCRIPT_FOLDER is $SCRIPT_FOLDER" -cd ${SCRIPT_FOLDER} +cd "${SCRIPT_FOLDER}" cd ../.. -export IONIC_PATH="$PWD" +# shellcheck source=./../log_start.sh +export IONIC_PATH="$PWD" && source "${IONIC_PATH}"/scripts/log_start.sh echo "IONIC_PATH is $IONIC_PATH" export INTERMEDIATE_PATH="$IONIC_PATH" @@ -55,3 +57,6 @@ echo "Cannot use exclamation point in app description" source ${INTERMEDIATE_PATH}/scripts/build_scripts/01_prepare_project.sh ionic resources ios + +# shellcheck source=./../log_end.sh +source "$IONIC_PATH"/scripts/log_end.sh "${BASH_SOURCE[0]}" diff --git a/scripts/commit-build.sh b/scripts/commit-build.sh index 9255b8c155..51a915d472 100644 --- a/scripts/commit-build.sh +++ b/scripts/commit-build.sh @@ -1,10 +1,12 @@ #!/usr/bin/env bash # shellcheck disable=SC2006 # shellcheck disable=SC2086 +set +x +set -e PARENT_SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/$(basename "${BASH_SOURCE[0]}")" && SCRIPT_FOLDER=`dirname ${PARENT_SCRIPT_PATH}` -echo "SCRIPT_FOLDER is $SCRIPT_FOLDER" && cd "${SCRIPT_FOLDER}" && cd .. && export IONIC_PATH="$PWD" && echo "IONIC_PATH is $IONIC_PATH" +# shellcheck source=./log_start.sh +echo "SCRIPT_FOLDER is $SCRIPT_FOLDER" && cd "${SCRIPT_FOLDER}" && cd .. && export IONIC_PATH="$PWD" && source "$IONIC_PATH"/scripts/log_start.sh "${BASH_SOURCE[0]}" BUILD_REPO=$IONIC_PATH/tmp/qm-web-build -set -xe git config user.email "m@quantimodo.com" git config user.name "mikepsinn" @@ -19,3 +21,5 @@ git add -A &> /dev/null git commit -m "$BUILD_URL $CHANGE_URL" git push +# shellcheck source=./log_start.sh +source "$IONIC_PATH"/scripts/log_end.sh "${BASH_SOURCE[0]}" diff --git a/scripts/cypress_run.sh b/scripts/cypress_run.sh index a28280a7e1..a6768242f4 100644 --- a/scripts/cypress_run.sh +++ b/scripts/cypress_run.sh @@ -1,8 +1,9 @@ #!/bin/bash +set +x +set -e PARENT_SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/$(basename "${BASH_SOURCE[0]}")" && SCRIPT_FOLDER=$(dirname "${PARENT_SCRIPT_PATH}") -echo "SCRIPT_FOLDER is $SCRIPT_FOLDER" && cd "${SCRIPT_FOLDER}" && cd .. && export IONIC_PATH="$PWD" && echo "IONIC_PATH is $IONIC_PATH" # shellcheck source=./log_start.sh -source "$IONIC_PATH"/scripts/log_start.sh "${BASH_SOURCE[0]}" +echo "SCRIPT_FOLDER is $SCRIPT_FOLDER" && cd "${SCRIPT_FOLDER}" && cd .. && export IONIC_PATH="$PWD" && source "$IONIC_PATH"/scripts/log_start.sh "${BASH_SOURCE[0]}" npm run cy:run if [[ ! -f success-file ]] ; then echo 'success-file is not there, aborting.' diff --git a/scripts/ghost-inspector.sh b/scripts/ghost-inspector.sh index b72df86423..a7d8296198 100644 --- a/scripts/ghost-inspector.sh +++ b/scripts/ghost-inspector.sh @@ -1,8 +1,8 @@ #!/bin/bash +set +x PARENT_SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/$(basename "${BASH_SOURCE[0]}")" && SCRIPT_FOLDER=$(dirname "${PARENT_SCRIPT_PATH}") -echo "SCRIPT_FOLDER is $SCRIPT_FOLDER" && cd "${SCRIPT_FOLDER}" && cd .. && export IONIC_PATH="$PWD" && echo "IONIC_PATH is $IONIC_PATH" # shellcheck source=./log_start.sh -source "$IONIC_PATH"/scripts/log_start.sh "${BASH_SOURCE[0]}" +echo "SCRIPT_FOLDER is $SCRIPT_FOLDER" && cd "${SCRIPT_FOLDER}" && cd .. && export IONIC_PATH="$PWD" && source "$IONIC_PATH"/scripts/log_start.sh "${BASH_SOURCE[0]}" set -xe npm run test:ghostinspector # shellcheck source=./log_end.sh diff --git a/scripts/heroku.sh b/scripts/heroku.sh index 2f4c872ab0..375aef38c3 100644 --- a/scripts/heroku.sh +++ b/scripts/heroku.sh @@ -1,8 +1,9 @@ #!/bin/bash +set +x +set -e PARENT_SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/$(basename "${BASH_SOURCE[0]}")" && SCRIPT_FOLDER=$(dirname "${PARENT_SCRIPT_PATH}") -echo "SCRIPT_FOLDER is $SCRIPT_FOLDER" && cd "${SCRIPT_FOLDER}" && cd .. && export IONIC_PATH="$PWD" && echo "IONIC_PATH is $IONIC_PATH" # shellcheck source=./log_start.sh -source "$IONIC_PATH"/scripts/log_start.sh "${BASH_SOURCE[0]}" +echo "SCRIPT_FOLDER is $SCRIPT_FOLDER" && cd "${SCRIPT_FOLDER}" && cd .. && export IONIC_PATH="$PWD" && source "$IONIC_PATH"/scripts/log_start.sh "${BASH_SOURCE[0]}" set -xe # shellcheck source=./no-root.sh source "$SCRIPT_FOLDER"/no-root.sh diff --git a/scripts/install.sh b/scripts/install.sh index 337e7e3f40..17031c6711 100644 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -2,12 +2,10 @@ # shellcheck disable=SC2006 # shellcheck disable=SC2086 set +x +set -e PARENT_SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/$(basename "${BASH_SOURCE[0]}")" && SCRIPT_FOLDER=`dirname ${PARENT_SCRIPT_PATH}` -echo "SCRIPT_FOLDER is $SCRIPT_FOLDER" && cd "${SCRIPT_FOLDER}" && cd .. && export IONIC_PATH="$PWD" && echo "IONIC_PATH is $IONIC_PATH" # shellcheck source=./log_start.sh -source $IONIC_PATH/scripts/log_start.sh "${BASH_SOURCE[0]}" -set -e -set -x +echo "SCRIPT_FOLDER is $SCRIPT_FOLDER" && cd "${SCRIPT_FOLDER}" && cd .. && export IONIC_PATH="$PWD" && source "$IONIC_PATH"/scripts/log_start.sh "${BASH_SOURCE[0]}" # shellcheck source=./no-root.sh source "$SCRIPT_FOLDER"/no-root.sh # shellcheck source=./nvm.sh @@ -20,4 +18,4 @@ if [[ ${NODE_NAME} = "sonicmaster-ubuntu" ]]; fi npm run configure:app # shellcheck source=./log_start.sh -source $IONIC_PATH/scripts/log_end.sh "${BASH_SOURCE[0]}" +source "$IONIC_PATH"/scripts/log_end.sh "${BASH_SOURCE[0]}" diff --git a/scripts/ionic_install_with_dependencies.sh b/scripts/ionic_install_with_dependencies.sh index 95dc34cc96..0281bc3e06 100644 --- a/scripts/ionic_install_with_dependencies.sh +++ b/scripts/ionic_install_with_dependencies.sh @@ -1,15 +1,17 @@ #!/usr/bin/env bash - +set +x +set -e PARENT_SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/$(basename "${BASH_SOURCE[0]}")" -SCRIPT_FOLDER=`dirname ${PARENT_SCRIPT_PATH}` +SCRIPT_FOLDER=$(dirname "${PARENT_SCRIPT_PATH}") echo "SCRIPT_FOLDER is $SCRIPT_FOLDER" -cd ${SCRIPT_FOLDER} +cd "${SCRIPT_FOLDER}" cd .. -export IONIC_PATH="$PWD" -echo "IONIC_PATH is $IONIC_PATH" +# shellcheck source=./log_start.sh +export IONIC_PATH="$PWD" && source "$IONIC_PATH"/scripts/log_end.sh "${BASH_SOURCE[0]}" + set -x -sudo bash ${IONIC_PATH}/scripts/android_sdk_install.sh +sudo bash "${IONIC_PATH}"/scripts/android_sdk_install.sh sudo curl -sSL https://get.docker.com/ | sh sudo usermod -aG docker jenkins @@ -35,3 +37,6 @@ sudo usermod -a -G ubuntu jenkins ionic info sudo chmod 777 -R $PWD sudo chmod -R 770 ${IONIC_PATH}/scripts + +# shellcheck source=./log_start.sh +source "$IONIC_PATH"/scripts/log_end.sh "${BASH_SOURCE[0]}" diff --git a/scripts/mocha.sh b/scripts/mocha.sh index 423cd6b25f..20a29e0167 100644 --- a/scripts/mocha.sh +++ b/scripts/mocha.sh @@ -1,9 +1,11 @@ #!/bin/bash +set +x +set -e PARENT_SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/$(basename "${BASH_SOURCE[0]}")" && SCRIPT_FOLDER=$(dirname "${PARENT_SCRIPT_PATH}") -echo "SCRIPT_FOLDER is $SCRIPT_FOLDER" && cd "${SCRIPT_FOLDER}" && cd .. && export IONIC_PATH="$PWD" && echo "IONIC_PATH is $IONIC_PATH" +echo "SCRIPT_FOLDER is $SCRIPT_FOLDER" && cd "${SCRIPT_FOLDER}" && cd .. && export IONIC_PATH="$PWD" && source "$IONIC_PATH"/scripts/log_start.sh "${BASH_SOURCE[0]}" # shellcheck source=./log_start.sh source "$IONIC_PATH"/scripts/log_start.sh "${BASH_SOURCE[0]}" -set -xe +set -x npm run types npm run test:mocha # shellcheck source=./log_end.sh diff --git a/scripts/no-root.sh b/scripts/no-root.sh index d8c72792d4..c9114a7638 100644 --- a/scripts/no-root.sh +++ b/scripts/no-root.sh @@ -1,4 +1,5 @@ #!/bin/bash +set +x if [[ $EUID -eq 0 ]]; then echo echo "================ Error =================" diff --git a/scripts/nvm.sh b/scripts/nvm.sh index fd4d876049..697f98fcab 100644 --- a/scripts/nvm.sh +++ b/scripts/nvm.sh @@ -1,11 +1,12 @@ #!/bin/bash # shellcheck disable=SC2086 # shellcheck disable=SC2006 +set +x +set -e PARENT_SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/$(basename "${BASH_SOURCE[0]}")" && SCRIPT_FOLDER=`dirname ${PARENT_SCRIPT_PATH}` -echo "SCRIPT_FOLDER is $SCRIPT_FOLDER" && cd "${SCRIPT_FOLDER}" && cd .. && export IONIC_PATH="$PWD" && echo "IONIC_PATH is $IONIC_PATH" +echo "SCRIPT_FOLDER is $SCRIPT_FOLDER" && cd "${SCRIPT_FOLDER}" && cd .. && export IONIC_PATH="$PWD" # shellcheck source=./no-root.sh source "$SCRIPT_FOLDER"/no-root.sh -set +x sudo chown -R $USER ~/.nvm command -v nvm >/dev/null 2>&1 || { echo >&2 "nvm is required, but it's not installed. Trying to install it now..."; @@ -21,3 +22,5 @@ echo "nvm use $1..." nvm use $1 set -x node -v +# shellcheck source=./log_start.sh +source "$IONIC_PATH"/scripts/log_end.sh "${BASH_SOURCE[0]}" diff --git a/scripts/nvm_install.sh b/scripts/nvm_install.sh index 2a0fcd3603..37c9073e8f 100644 --- a/scripts/nvm_install.sh +++ b/scripts/nvm_install.sh @@ -1,7 +1,8 @@ #!/usr/bin/env bash set +x +set -e PARENT_SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/$(basename "${BASH_SOURCE[0]}")" && SCRIPT_FOLDER=$(dirname "${PARENT_SCRIPT_PATH}") -echo "SCRIPT_FOLDER is $SCRIPT_FOLDER" && cd "${SCRIPT_FOLDER}" && cd .. && export IONIC_PATH="$PWD" && echo "IONIC_PATH is $IONIC_PATH" +echo "SCRIPT_FOLDER is $SCRIPT_FOLDER" && cd "${SCRIPT_FOLDER}" && cd .. && export IONIC_PATH="$PWD" && source "$IONIC_PATH"/scripts/log_start.sh "${BASH_SOURCE[0]}" set -x sudo chown -R "$USER" ~/.nvm || true sudo apt install -y curl diff --git a/scripts/test.sh b/scripts/test.sh index ba44b93420..18071d27e3 100644 --- a/scripts/test.sh +++ b/scripts/test.sh @@ -1,8 +1,10 @@ #! /bin/bash +set +x +set -e PARENT_SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/$(basename "${BASH_SOURCE[0]}")" && SCRIPT_FOLDER=$(dirname "${PARENT_SCRIPT_PATH}") -echo "SCRIPT_FOLDER is $SCRIPT_FOLDER" && cd "${SCRIPT_FOLDER}" && cd .. && export IONIC_PATH="$PWD" && echo "IONIC_PATH is $IONIC_PATH" # shellcheck source=./log_start.sh -source "$IONIC_PATH"/scripts/log_start.sh "${BASH_SOURCE[0]}" +echo "SCRIPT_FOLDER is $SCRIPT_FOLDER" && cd "${SCRIPT_FOLDER}" && cd .. && export IONIC_PATH="$PWD" && source "$IONIC_PATH"/scripts/log_start.sh "${BASH_SOURCE[0]}" + set -xe sudo bash "${SCRIPT_FOLDER}"/output_commit_message_and_env.sh # shellcheck source=./no-root.sh From 63316bd16fa9375ebb5593bfa1c3aff3bd7c3d22 Mon Sep 17 00:00:00 2001 From: mikepsinn Date: Wed, 7 Jul 2021 21:24:23 -0500 Subject: [PATCH 11/11] echo "SCRIPT_FOLDER is $SCRIPT_FOLDER" && --- scripts/commit-build.sh | 2 +- scripts/cypress_run.sh | 2 +- scripts/ghost-inspector.sh | 2 +- scripts/heroku.sh | 2 +- scripts/install.sh | 2 +- scripts/mocha.sh | 2 +- scripts/nvm.sh | 2 +- scripts/nvm_install.sh | 2 +- scripts/test.sh | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/scripts/commit-build.sh b/scripts/commit-build.sh index 51a915d472..581604af9b 100644 --- a/scripts/commit-build.sh +++ b/scripts/commit-build.sh @@ -5,7 +5,7 @@ set +x set -e PARENT_SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/$(basename "${BASH_SOURCE[0]}")" && SCRIPT_FOLDER=`dirname ${PARENT_SCRIPT_PATH}` # shellcheck source=./log_start.sh -echo "SCRIPT_FOLDER is $SCRIPT_FOLDER" && cd "${SCRIPT_FOLDER}" && cd .. && export IONIC_PATH="$PWD" && source "$IONIC_PATH"/scripts/log_start.sh "${BASH_SOURCE[0]}" +cd "${SCRIPT_FOLDER}" && cd .. && export IONIC_PATH="$PWD" && source "$IONIC_PATH"/scripts/log_start.sh "${BASH_SOURCE[0]}" BUILD_REPO=$IONIC_PATH/tmp/qm-web-build git config user.email "m@quantimodo.com" diff --git a/scripts/cypress_run.sh b/scripts/cypress_run.sh index a6768242f4..f5c437e668 100644 --- a/scripts/cypress_run.sh +++ b/scripts/cypress_run.sh @@ -3,7 +3,7 @@ set +x set -e PARENT_SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/$(basename "${BASH_SOURCE[0]}")" && SCRIPT_FOLDER=$(dirname "${PARENT_SCRIPT_PATH}") # shellcheck source=./log_start.sh -echo "SCRIPT_FOLDER is $SCRIPT_FOLDER" && cd "${SCRIPT_FOLDER}" && cd .. && export IONIC_PATH="$PWD" && source "$IONIC_PATH"/scripts/log_start.sh "${BASH_SOURCE[0]}" +cd "${SCRIPT_FOLDER}" && cd .. && export IONIC_PATH="$PWD" && source "$IONIC_PATH"/scripts/log_start.sh "${BASH_SOURCE[0]}" npm run cy:run if [[ ! -f success-file ]] ; then echo 'success-file is not there, aborting.' diff --git a/scripts/ghost-inspector.sh b/scripts/ghost-inspector.sh index a7d8296198..8842f1e333 100644 --- a/scripts/ghost-inspector.sh +++ b/scripts/ghost-inspector.sh @@ -2,7 +2,7 @@ set +x PARENT_SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/$(basename "${BASH_SOURCE[0]}")" && SCRIPT_FOLDER=$(dirname "${PARENT_SCRIPT_PATH}") # shellcheck source=./log_start.sh -echo "SCRIPT_FOLDER is $SCRIPT_FOLDER" && cd "${SCRIPT_FOLDER}" && cd .. && export IONIC_PATH="$PWD" && source "$IONIC_PATH"/scripts/log_start.sh "${BASH_SOURCE[0]}" +cd "${SCRIPT_FOLDER}" && cd .. && export IONIC_PATH="$PWD" && source "$IONIC_PATH"/scripts/log_start.sh "${BASH_SOURCE[0]}" set -xe npm run test:ghostinspector # shellcheck source=./log_end.sh diff --git a/scripts/heroku.sh b/scripts/heroku.sh index 375aef38c3..c5637d568a 100644 --- a/scripts/heroku.sh +++ b/scripts/heroku.sh @@ -3,7 +3,7 @@ set +x set -e PARENT_SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/$(basename "${BASH_SOURCE[0]}")" && SCRIPT_FOLDER=$(dirname "${PARENT_SCRIPT_PATH}") # shellcheck source=./log_start.sh -echo "SCRIPT_FOLDER is $SCRIPT_FOLDER" && cd "${SCRIPT_FOLDER}" && cd .. && export IONIC_PATH="$PWD" && source "$IONIC_PATH"/scripts/log_start.sh "${BASH_SOURCE[0]}" +cd "${SCRIPT_FOLDER}" && cd .. && export IONIC_PATH="$PWD" && source "$IONIC_PATH"/scripts/log_start.sh "${BASH_SOURCE[0]}" set -xe # shellcheck source=./no-root.sh source "$SCRIPT_FOLDER"/no-root.sh diff --git a/scripts/install.sh b/scripts/install.sh index 17031c6711..25cfbece0d 100644 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -5,7 +5,7 @@ set +x set -e PARENT_SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/$(basename "${BASH_SOURCE[0]}")" && SCRIPT_FOLDER=`dirname ${PARENT_SCRIPT_PATH}` # shellcheck source=./log_start.sh -echo "SCRIPT_FOLDER is $SCRIPT_FOLDER" && cd "${SCRIPT_FOLDER}" && cd .. && export IONIC_PATH="$PWD" && source "$IONIC_PATH"/scripts/log_start.sh "${BASH_SOURCE[0]}" +cd "${SCRIPT_FOLDER}" && cd .. && export IONIC_PATH="$PWD" && source "$IONIC_PATH"/scripts/log_start.sh "${BASH_SOURCE[0]}" # shellcheck source=./no-root.sh source "$SCRIPT_FOLDER"/no-root.sh # shellcheck source=./nvm.sh diff --git a/scripts/mocha.sh b/scripts/mocha.sh index 20a29e0167..dd07ea5fe4 100644 --- a/scripts/mocha.sh +++ b/scripts/mocha.sh @@ -2,7 +2,7 @@ set +x set -e PARENT_SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/$(basename "${BASH_SOURCE[0]}")" && SCRIPT_FOLDER=$(dirname "${PARENT_SCRIPT_PATH}") -echo "SCRIPT_FOLDER is $SCRIPT_FOLDER" && cd "${SCRIPT_FOLDER}" && cd .. && export IONIC_PATH="$PWD" && source "$IONIC_PATH"/scripts/log_start.sh "${BASH_SOURCE[0]}" +cd "${SCRIPT_FOLDER}" && cd .. && export IONIC_PATH="$PWD" && source "$IONIC_PATH"/scripts/log_start.sh "${BASH_SOURCE[0]}" # shellcheck source=./log_start.sh source "$IONIC_PATH"/scripts/log_start.sh "${BASH_SOURCE[0]}" set -x diff --git a/scripts/nvm.sh b/scripts/nvm.sh index 697f98fcab..a78d6f8d95 100644 --- a/scripts/nvm.sh +++ b/scripts/nvm.sh @@ -4,7 +4,7 @@ set +x set -e PARENT_SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/$(basename "${BASH_SOURCE[0]}")" && SCRIPT_FOLDER=`dirname ${PARENT_SCRIPT_PATH}` -echo "SCRIPT_FOLDER is $SCRIPT_FOLDER" && cd "${SCRIPT_FOLDER}" && cd .. && export IONIC_PATH="$PWD" +cd "${SCRIPT_FOLDER}" && cd .. && export IONIC_PATH="$PWD" # shellcheck source=./no-root.sh source "$SCRIPT_FOLDER"/no-root.sh sudo chown -R $USER ~/.nvm diff --git a/scripts/nvm_install.sh b/scripts/nvm_install.sh index 37c9073e8f..9d3f830603 100644 --- a/scripts/nvm_install.sh +++ b/scripts/nvm_install.sh @@ -2,7 +2,7 @@ set +x set -e PARENT_SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/$(basename "${BASH_SOURCE[0]}")" && SCRIPT_FOLDER=$(dirname "${PARENT_SCRIPT_PATH}") -echo "SCRIPT_FOLDER is $SCRIPT_FOLDER" && cd "${SCRIPT_FOLDER}" && cd .. && export IONIC_PATH="$PWD" && source "$IONIC_PATH"/scripts/log_start.sh "${BASH_SOURCE[0]}" +cd "${SCRIPT_FOLDER}" && cd .. && export IONIC_PATH="$PWD" && source "$IONIC_PATH"/scripts/log_start.sh "${BASH_SOURCE[0]}" set -x sudo chown -R "$USER" ~/.nvm || true sudo apt install -y curl diff --git a/scripts/test.sh b/scripts/test.sh index 18071d27e3..cfdefba18d 100644 --- a/scripts/test.sh +++ b/scripts/test.sh @@ -3,7 +3,7 @@ set +x set -e PARENT_SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/$(basename "${BASH_SOURCE[0]}")" && SCRIPT_FOLDER=$(dirname "${PARENT_SCRIPT_PATH}") # shellcheck source=./log_start.sh -echo "SCRIPT_FOLDER is $SCRIPT_FOLDER" && cd "${SCRIPT_FOLDER}" && cd .. && export IONIC_PATH="$PWD" && source "$IONIC_PATH"/scripts/log_start.sh "${BASH_SOURCE[0]}" +cd "${SCRIPT_FOLDER}" && cd .. && export IONIC_PATH="$PWD" && source "$IONIC_PATH"/scripts/log_start.sh "${BASH_SOURCE[0]}" set -xe sudo bash "${SCRIPT_FOLDER}"/output_commit_message_and_env.sh