@@ -27,13 +27,13 @@ CONFIG_DATA="just.config.json"
2727source $GITHUB_ACTION_PATH /src/modules/errmsg.sh
2828
2929VERSION=$( echo " $GITHUB_ACTION_PATH " | grep -oP ' (?<=/v)[0-9]+\.[0-9]+\.[0-9]+(-[a-zA-Z0-9]+)?' )
30- msg1=( $( _justMessage " Running Just an Ultimate Site Tool v$VERSION " ) )
31- msg2=( $( _justMessage " Installing Node.js" ) )
32- msg3=( $( _justMessage " Installed Node.js" ) )
33- msg4=( $( _justMessage " Postprocessing completed" ) )
34- msg5=( $( _justMessage " Generating completed" ) )
35- msg6=( $( _justMessage " Compressing completed" ) )
36- msg7=( $( _justMessage " Generating completed" ) )
30+ msg1=$( _justMessage " Running Just an Ultimate Site Tool v$VERSION " )
31+ msg2=$( _justMessage " Installing Node.js" )
32+ msg3=$( _justMessage " Installed Node.js" )
33+ msg4=$( _justMessage " Postprocessing completed" )
34+ msg5=$( _justMessage " Generating completed" )
35+ msg6=$( _justMessage " Compressing completed" )
36+ msg7=$( _justMessage " Generating completed" )
3737echo " $msg1 "
3838
3939installNodejs () {
@@ -49,47 +49,47 @@ installNodejs() {
4949}
5050
5151if [ -f " $CONFIG_DATA " ]; then
52- local ERROR_MESSAGE=( $( ErrorMessage " run.sh" " 0113" ) )
53- echo $ERROR_MESSAGE && exit 1
52+ local ERROR_MESSAGE=$( ErrorMessage " run.sh" " 0113" )
53+ echo " $ERROR_MESSAGE " && exit 1
5454fi
5555
5656if [ ! -f " $CONFIG_FILE " ]; then
57- local ERROR_MESSAGE=( $( ErrorMessage " run.sh" " 0108" ) )
58- echo $ERROR_MESSAGE && exit 1
57+ local ERROR_MESSAGE=$( ErrorMessage " run.sh" " 0108" )
58+ echo " $ERROR_MESSAGE " && exit 1
5959fi
6060
6161CONFIG_JSON=$( node -e " console.log(JSON.stringify(require('./just.config.js')));" )
6262if [ $? -ne 0 ]; then
63- local ERROR_MESSAGE=( $( ErrorMessage " run.sh" " 0109" ) )
64- echo $ERROR_MESSAGE && exit 1
63+ local ERROR_MESSAGE=$( ErrorMessage " run.sh" " 0109" )
64+ echo " $ERROR_MESSAGE " && exit 1
6565fi
6666echo " Parsed just.config.js module.exports: $CONFIG_JSON " # debug
6767echo " $CONFIG_JSON " > " $CONFIG_DATA "
6868
6969if [ -z " $( echo " $CONFIG_JSON " | jq -r ' .module.exports' ) " ]; then
70- local ERROR_MESSAGE=( $( ErrorMessage " run.sh" " 0112" ) )
71- echo $ERROR_MESSAGE && exit 1
70+ local ERROR_MESSAGE=$( ErrorMessage " run.sh" " 0112" )
71+ echo " $ERROR_MESSAGE " && exit 1
7272fi
7373
7474TYPE=$( echo " $CONFIG_JSON " | jq -r ' .type' )
7575if [ -z " $TYPE " ]; then
76- local ERROR_MESSAGE=( $( ErrorMessage " run.sh" " 0110" ) )
77- echo $ERROR_MESSAGE && exit 1
76+ local ERROR_MESSAGE=$( ErrorMessage " run.sh" " 0110" )
77+ echo " $ERROR_MESSAGE " && exit 1
7878fi
7979
8080if [[ " $TYPE " != " postprocessor" && " $TYPE " != " redirector" && " $TYPE " != " compressor" && " $TYPE " != " generator" ]]; then
81- local ERROR_MESSAGE=( $( ErrorMessage " run.sh" " 0111" ) )
82- echo $ERROR_MESSAGE && exit 1
81+ local ERROR_MESSAGE=$( ErrorMessage " run.sh" " 0111" )
82+ echo " $ERROR_MESSAGE " && exit 1
8383fi
8484
8585if [ " $TYPE " != " compressor" ]; then
8686 if [ -d " deploy" ]; then
87- local ERROR_MESSAGE=( $( ErrorMessage " important_dirs" " 0106" ) )
88- echo $ERROR_MESSAGE && exit 1
87+ local ERROR_MESSAGE=$( ErrorMessage " important_dirs" " 0106" )
88+ echo " $ERROR_MESSAGE " && exit 1
8989 fi
9090 if [ -d " _just_data" ]; then
91- local ERROR_MESSAGE=( $( ErrorMessage " important_dirs" " 0107" ) )
92- echo $ERROR_MESSAGE && exit 1
91+ local ERROR_MESSAGE=$( ErrorMessage " important_dirs" " 0107" )
92+ echo " $ERROR_MESSAGE " && exit 1
9393 fi
9494 mkdir -p deploy
9595 mkdir -p _just_data
@@ -100,11 +100,11 @@ if [ "$TYPE" == "postprocessor" ]; then
100100 postprocessor_checks=$( bash $GITHUB_ACTION_PATH /src/postprocessor/checks.sh 2>&1 ) || {
101101 local error_code=$?
102102 if [ $error_code -eq 1 ]; then
103- local ERROR_MESSAGE=( $( ErrorMessage " postprocessor/checks.sh" " 0100" " $postprocessor_checks " ) )
103+ local ERROR_MESSAGE=$( ErrorMessage " postprocessor/checks.sh" " 0100" " $postprocessor_checks " )
104104 if [ " $postprocessor_checks " == " 0101" ]; then
105- ERROR_MESSAGE=( $( ErrorMessage " postprocessor/checks.sh" " 0101" ) )
105+ ERROR_MESSAGE=$( ErrorMessage " postprocessor/checks.sh" " 0101" )
106106 fi
107- echo $ERROR_MESSAGE && exit 1
107+ echo " $ERROR_MESSAGE " && exit 1
108108 fi
109109 } && \
110110 bash $GITHUB_ACTION_PATH /src/postprocessor/prepare_deployment.sh && \
0 commit comments