Skip to content

Commit 02b7493

Browse files
committed
devonfw#13: fixed using sensitive quoting
1 parent 3651dd3 commit 02b7493

File tree

2 files changed

+23
-28
lines changed

2 files changed

+23
-28
lines changed

scripts/src/main/resources/create-or-update-workspace

+17-21
Original file line numberDiff line numberDiff line change
@@ -3,56 +3,52 @@ set -e
33

44
cd `dirname $0`
55

6-
if [ -n $1 ]; then
6+
if [ -n "$1" ]; then
77
WORKSPACE=$1
88
fi
99

1010
. scripts/environment-project
1111

12-
if [ ! -d $SOFTWARE_PATH ]; then
13-
echo "Could not find folder $SOFTWARE_PATH"
14-
echo "If you want to change its name see the variables"
12+
if [ ! -d "$SOFTWARE_PATH" ]; then
13+
echo "Could not find folder '$SOFTWARE_PATH' (from variable SOFTWARE_PATH)"
1514
echo "Execution aborted"
1615
exit 1
1716
fi
18-
if [ ! -d $WORKSPACES_PATH ]; then
19-
echo "Could not find folder $WORKSPACES_PATH"
20-
echo "If you want to change its name see the variables"
17+
if [ ! -d "$WORKSPACES_PATH" ]; then
18+
echo "Could not find folder '$WORKSPACES_PATH' (from variable WORKSPACES_PATH)"
2119
echo "Execution aborted"
2220
exit 1
2321
fi
24-
if [ ! -d $WORKSPACE_PATH ]; then
25-
echo "Could not find workspace $WORKSPACE_PATH"
22+
if [ ! -d "$WORKSPACE_PATH" ]; then
23+
echo "Could not find folder '$WORKSPACE_PATH' (from variable WORKSPACE_PATH)"
2624
echo "Execution aborted"
2725
exit 1
2826
fi
29-
if [ ! -d $SETTINGS_PATH ]; then
30-
echo "Could not find folder $SETTINGS_PATH"
31-
echo "If you want to change its name see the variables"
27+
if [ ! -d "$SETTINGS_PATH" ]; then
28+
echo "Could not find folder '$SETTINGS_PATH' (from variable SETTINGS_PATH)"
3229
echo "Execution aborted"
3330
exit 1
3431
fi
3532

36-
37-
if [ ! -e $CONF_PATH/.m2 ]; then
38-
mkdir -p $CONF_PATH/.m2
33+
if [ ! -e "$CONF_PATH/.m2" ]; then
34+
mkdir -p "$CONF_PATH/.m2"
3935
fi
40-
if [ ! -e $CONF_PATH/.m2/settings.xml ]; then
41-
cp $SETTINGS_PATH/maven/settings.xml $CONF_PATH/.m2/settings.xml
36+
if [ ! -e "$CONF_PATH/.m2/settings.xml" ]; then
37+
cp "$SETTINGS_PATH/maven/settings.xml" "$CONF_PATH/.m2/settings.xml"
4238
echo "Copied $SETTINGS_PATH/maven/settings.xml to $CONF_PATH/.m2/settings.xml"
4339
fi
4440

4541
# TODO: Port subversion config
4642

4743

4844
ECLIPSE_TEMPLATES_PATH=$SETTINGS_PATH\eclipse\workspace
49-
if [ ! -d $ECLIPSE_TEMPLATES_PATH ]; then
50-
echo "Could not find folder $ECLIPSE_TEMPLATES_PATH"
45+
if [ ! -d "$ECLIPSE_TEMPLATES_PATH" ]; then
46+
echo "Could not find folder '$ECLIPSE_TEMPLATES_PATH' (from variable ECLIPSE_TEMPLATES_PATH)"
5147
echo "Execution aborted"
5248
exit 1
5349
fi
54-
if [ ! -e $REPLACEMENT_PATTERNS_PATH ]; then
55-
echo "Could not find file $REPLACEMENT_PATTERNS_PATH"
50+
if [ ! -e "$REPLACEMENT_PATTERNS_PATH" ]; then
51+
echo "Could not find file '$REPLACEMENT_PATTERNS_PATH' (from variable REPLACEMENT_PATTERNS_PATH)"
5652
echo "Execution aborted"
5753
exit 1
5854
fi

scripts/src/main/resources/scripts/environment-project

+6-7
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,22 @@
11
. $PWD/variables
2-
if [ -f $PWD/variables-customized ]; then
3-
. $PWD/variables-customized
2+
if [ -f "$PWD/variables-customized" ]; then
3+
. "$PWD/variables-customized"
44
fi
55
export SOFTWARE_PATH=$PWD/software
66

7-
if [ -z $WORKSPACE ]; then
8-
export WORKSPACE=$MAIN_BRANCH
7+
if [ -z "$WORKSPACE" ]; then
8+
export WORKSPACE=$MAIN_BRANCH
99
fi
1010
export WORKSPACE_PATH=$PWD/$WORKSPACES_PATH/$WORKSPACE
1111

1212
export WORKSPACE_PLUGINS_PATH=$WORKSPACE_PATH/.metadata/.plugins
1313
export SETTINGS_PATH=$WORKSPACES_PATH/$MAIN_BRANCH/$SETTINGS_REL_PATH
1414
export ECLIPSE_TEMPLATES_PATH=$SETTINGS_PATH/$ECLIPSE_TEMPLATES_REL_PATH
1515

16-
if [ -f $SETTINGS_PATH/ide-properties ]; then
17-
. $SETTINGS_PATH/ide-properties
16+
if [ -f "$SETTINGS_PATH/ide-properties" ]; then
17+
. "$SETTINGS_PATH/ide-properties"
1818
fi
1919

20-
export OASP4J_IDE_VERSION=${project.version}
2120
export IDE_CONFIGURATOR=devon-ide-configurator-${devon-ide.version}.jar
2221

2322
###

0 commit comments

Comments
 (0)