Fix demo program provisioning on BSD/Macs

mikix · mikix · commit 6feb5603c433 · 2018-05-09T16:12:08.000-04:00
diff --git a/course-generator/build-course-json.sh b/course-generator/build-course-json.sh
@@ -1,4 +1,4 @@
-# Script to build course configurations in proper json format that can be passed into provision-courses.sh
+# Script to build course configurations in proper json format that can be passed into create-courses.sh
 # See test-course.json for a master list of course configurations
 # TODO: Link documentation for course-generator-tool
 # USAGE: ./build-course-json.sh [course-config-file]
diff --git a/programs/provision.sh b/programs/provision.sh
@@ -28,7 +28,7 @@ notice() {
 reset_color() {
     SWITCH="\033["
     NORMAL="${SWITCH}0m"
-    echo "${NORMAL}"
+    echo -n "${NORMAL}"
 }
 
 docker_exec() {
@@ -50,7 +50,7 @@ provision_ida() {
     cmd=${2:-"shell"}
 
     # Escape double quotes and backticks from the Python
-    PROGRAM_SCRIPT="$(sed 's/\("\|`\)/\\\1/g' < "$BASEDIR/$service.py")"
+    PROGRAM_SCRIPT="$(sed -E 's/("|`)/\\\1/g' < "$BASEDIR/$service.py")"
 
     cmd="$cmd -c \"$PROGRAM_SCRIPT\""
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# Script to build course configurations in proper json format that can be passed into provision-courses.sh`
	`1`	`+# Script to build course configurations in proper json format that can be passed into create-courses.sh`
`2`	`2`	`# See test-course.json for a master list of course configurations`
`3`	`3`	`# TODO: Link documentation for course-generator-tool`
`4`	`4`	`# USAGE: ./build-course-json.sh [course-config-file]`