Skip to content

Commit 7ee0b59

Browse files
committed
of script fix variables
1 parent e6b06dc commit 7ee0b59

File tree

1 file changed

+19
-17
lines changed

1 file changed

+19
-17
lines changed

scripts/of.sh

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -60,56 +60,58 @@ coreScriptPath() {
6060
autoDetectOS
6161
echo " platfrom:[$OF_PLATFORM] arch:[$OF_ARCH]"
6262
coreScriptPath
63-
echo " coreScriptPath: $OF_SCRIPT_PATH"
63+
echo " coreScriptPath: [$OF_SCRIPT_PATH]"
6464

6565
runCommand() {
6666
local CMD=$1
6767
local SUBCMD=$2
6868
local SCRIPT
69+
6970
case "$CMD" in
7071
setup)
71-
echo "openFrameworks setup"
72+
echo "openFrameworks setup"
7273
SCRIPT="${OF_SCRIPT_PATH}/setup.sh"
7374
;;
7475
update)
75-
echo "openFrameworks update"
76+
echo "openFrameworks update"
7677
SCRIPT="${OF_SCRIPT_PATH}/download_libs.sh"
7778
;;
7879
upgrade)
7980
echo "openFrameworks upgrade"
8081
case "$SUBCMD" in
8182
addons)
8283
echo "Upgrading addons"
83-
SCRIPT="${OF_SCRIPT_PATH}/dev/upgrade.sh addons"
84+
SCRIPT="${OF_SCRIPT_PATH}/dev/upgrade.sh"
8485
;;
8586
apps)
8687
echo "Upgrading apps"
87-
echo "Warning: This script will modify files in the Apps folder. Stop and Back up the folder. Commit all to all local repos. Then Continue"
88-
echo "Please confirm backup your projects before proceeding."
89-
read -p "Do you want to continue? (Y/n): " CONFIRM
90-
if [[ ! "$CONFIRM" =~ ^[Yy]$ ]]; then
91-
echo "Upgrade cancelled. No changes were made."
92-
exit 0
93-
fi
94-
SCRIPT="${OF_SCRIPT_PATH}/dev/upgrade.sh addons"
88+
echo "Warning: This script will modify files in the Apps folder. Stop and back up the folder. Commit all to local repos before proceeding."
89+
read -p "Do you want to continue? (Y/n): " CONFIRM
90+
if [[ ! "$CONFIRM" =~ ^[Yy]$ ]]; then
91+
echo "Upgrade cancelled. No changes were made."
92+
exit 0
93+
fi
94+
SCRIPT="${OF_SCRIPT_PATH}/dev/upgrade.sh"
9595
;;
9696
*)
9797
echo "Unknown upgrade action: $SUBCMD"
98-
echo "Valid upgrade actions: addons"
98+
echo "Valid upgrade actions: addons, apps"
9999
exit 1
100100
;;
101101
esac
102+
;;
102103
*)
103-
echo "Unknown command: $command"
104-
echo "Valid commands: setup, update"
104+
echo "Unknown command: $CMD"
105+
echo "Valid commands: setup, update, upgrade"
105106
exit 1
106107
;;
107108
esac
109+
108110
if [[ -x "$SCRIPT" ]]; then
109-
echo "Executing platform-specific script: $SCRIPT"
111+
echo "runCommand: [$SCRIPT]"
110112
"$SCRIPT" "${@:2}"
111113
else
112-
echo "Error: Script for '$CMD' not found at $SCRIPT"
114+
echo "Error: Script for ['$CMD'] not found or not executable at: [$SCRIPT]"
113115
exit 1
114116
fi
115117
}

0 commit comments

Comments
 (0)