Use sed instead of envsubst for more portability

Author: ja-openai

webapp/src/main/resources/templates/cli/install.sh

@@ -19,13 +19,12 @@
 mkdir -p {{installDirectory}}
 
 # Create the bash wrapper for the CLI
-cat << 'EOF' | envsubst '$PWD' > {{installDirectory}}/mojito
+cat > {{installDirectory}}/mojito-tmp << 'EOF'
 #!/usr/bin/env bash
 {{#hasHeaders}}
 {{#headers}}
 if [ -z "{{{envVarPresenceCheck}}}" ]; then
   echo "Environment variable {{envVar}} must be set before running this command."
-  exit 1
 fi
 {{/headers}}
 {{#authenticationMode}}
@@ -39,6 +38,10 @@ java -Dl10n.resttemplate.host={{host}} \
      -jar {{installDirectory}}/mojito-cli.jar "$@" ;
 EOF
 
+_ESC="$(printf '%s' "${PWD}" | sed 's/[\/&]/\\&/g')"
+sed "s|\${PWD}|$_ESC|g" {{installDirectory}}/mojito-tmp > {{installDirectory}}/mojito
+rm {{installDirectory}}/mojito-tmp
+
 # Make the wrapper executable
 chmod +x {{installDirectory}}/mojito
 

webapp/src/test/resources/com/box/l10n/mojito/service/cli/install.sh

@@ -19,15 +19,19 @@
 mkdir -p ${PWD}/.mojito
 
 # Create the bash wrapper for the CLI
-cat > ${PWD}/.mojito/mojito << 'EOF'
+cat > ${PWD}/.mojito/mojito-tmp << 'EOF'
 #!/usr/bin/env bash
-java -Dl10n.resttemplate.host=localhost \\
-     -Dl10n.resttemplate.scheme=http \\
-     -Dl10n.resttemplate.port=8080 \\
-     -Dlogging.file.path=${PWD}/.mojito \\
-     -jar ${PWD}/.mojito/mojito-cli.jar "\$@" ;
+java -Dl10n.resttemplate.host=localhost \
+     -Dl10n.resttemplate.scheme=http \
+     -Dl10n.resttemplate.port=8080 \
+     -Dlogging.file.path=${PWD}/.mojito \
+     -jar ${PWD}/.mojito/mojito-cli.jar "$@" ;
 EOF
 
+_ESC="$(printf '%s' "${PWD}" | sed 's/[\/&]/\\&/g')"
+sed "s|\${PWD}|$_ESC|g" ${PWD}/.mojito/mojito-tmp > ${PWD}/.mojito/mojito
+rm ${PWD}/.mojito/mojito-tmp
+
 # Make the wrapper executable
 chmod +x ${PWD}/.mojito/mojito
 

webapp/src/test/resources/com/box/l10n/mojito/service/cli/install_with_cf_headers.sh

@@ -19,24 +19,26 @@
 mkdir -p ${PWD}/.mojito
 
 # Create the bash wrapper for the CLI
-cat > ${PWD}/.mojito/mojito << 'EOF'
+cat > ${PWD}/.mojito/mojito-tmp << 'EOF'
 #!/usr/bin/env bash
 if [ -z "${L10N_RESTTEMPLATE_HEADER_HEADERS_CF_ACCESS_CLIENT_ID:-}" ]; then
   echo "Environment variable L10N_RESTTEMPLATE_HEADER_HEADERS_CF_ACCESS_CLIENT_ID must be set before running this command."
-  exit 1
 fi
 if [ -z "${L10N_RESTTEMPLATE_HEADER_HEADERS_CF_ACCESS_CLIENT_SECRET:-}" ]; then
   echo "Environment variable L10N_RESTTEMPLATE_HEADER_HEADERS_CF_ACCESS_CLIENT_SECRET must be set before running this command."
-  exit 1
 fi
 export L10N_RESTTEMPLATE_AUTHENTICATION_MODE=HEADER
-java -Dl10n.resttemplate.host=localhost \\
-     -Dl10n.resttemplate.scheme=http \\
-     -Dl10n.resttemplate.port=8080 \\
-     -Dlogging.file.path=${PWD}/.mojito \\
-     -jar ${PWD}/.mojito/mojito-cli.jar "\$@" ;
+java -Dl10n.resttemplate.host=localhost \
+     -Dl10n.resttemplate.scheme=http \
+     -Dl10n.resttemplate.port=8080 \
+     -Dlogging.file.path=${PWD}/.mojito \
+     -jar ${PWD}/.mojito/mojito-cli.jar "$@" ;
 EOF
 
+_ESC="$(printf '%s' "${PWD}" | sed 's/[\/&]/\\&/g')"
+sed "s|\${PWD}|$_ESC|g" ${PWD}/.mojito/mojito-tmp > ${PWD}/.mojito/mojito
+rm ${PWD}/.mojito/mojito-tmp
+
 # Make the wrapper executable
 chmod +x ${PWD}/.mojito/mojito