Skip to content

Commit 2e34ad4

Browse files
authored
Bash quirks removed
1 parent eedea69 commit 2e34ad4

File tree

2 files changed

+48
-46
lines changed

2 files changed

+48
-46
lines changed

assets/AppRun

Lines changed: 24 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,32 @@
11
#!/bin/sh
22

33
DIR="$(dirname "$(readlink -f "${0}")")"
4-
LIBS=(
5-
"rhino-1.7.15"
6-
"picocli-4.7.6"
7-
"xmlgraphics-commons-2.9"
8-
"batik-anim-1.17"
9-
"batik-bridge-1.17"
10-
"batik-css-1.17"
11-
"batik-dom-1.17"
12-
"batik-gvt-1.17"
13-
"batik-transcoder-1.17"
14-
"batik-util-1.17"
15-
"batik-i18n-1.17"
16-
"batik-svg-dom-1.17"
17-
"batik-constants-1.17"
18-
"batik-ext-1.17"
19-
"batik-xml-1.17"
20-
"batik-parser-1.17"
21-
"batik-script-1.17"
22-
"batik-awt-util-1.17"
23-
"xml-apis-ext-1.3.04"
24-
)
4+
LIBS="
5+
rhino-1.7.15
6+
picocli-4.7.6
7+
xmlgraphics-commons-2.9
8+
batik-anim-1.17
9+
batik-bridge-1.17
10+
batik-css-1.17
11+
batik-dom-1.17
12+
batik-gvt-1.17
13+
batik-transcoder-1.17
14+
batik-util-1.17
15+
batik-i18n-1.17
16+
batik-svg-dom-1.17
17+
batik-constants-1.17
18+
batik-ext-1.17
19+
batik-xml-1.17
20+
batik-parser-1.17
21+
batik-script-1.17
22+
batik-awt-util-1.17
23+
xml-apis-ext-1.3.04
24+
"
25+
2526
CLASSPATH=""
2627

27-
for JAR in ${LIBS[@]}; do
28-
CLASSPATH+=":$DIR/../lib/$JAR.jar"
28+
for JAR in $LIBS; do
29+
CLASSPATH="$CLASSPATH:$DIR/../lib/$JAR.jar"
2930
done
3031

3132
exec "$DIR/jre/bin/svgwall" \

build.sh

Lines changed: 24 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -7,27 +7,28 @@ ASSETS="$DIR/assets"
77
BATIK="$ASSETS/batik-1.17/lib"
88
APPDIR="$DIR/svgwall.AppDir"
99
USR="$APPDIR/usr"
10-
LIBS=(
11-
"rhino-1.7.15"
12-
"picocli-4.7.6"
13-
"xmlgraphics-commons-2.9"
14-
"batik-anim-1.17"
15-
"batik-bridge-1.17"
16-
"batik-css-1.17"
17-
"batik-dom-1.17"
18-
"batik-gvt-1.17"
19-
"batik-transcoder-1.17"
20-
"batik-util-1.17"
21-
"batik-i18n-1.17"
22-
"batik-svg-dom-1.17"
23-
"batik-constants-1.17"
24-
"batik-ext-1.17"
25-
"batik-xml-1.17"
26-
"batik-parser-1.17"
27-
"batik-script-1.17"
28-
"batik-awt-util-1.17"
29-
"xml-apis-ext-1.3.04"
30-
)
10+
LIBS="
11+
rhino-1.7.15
12+
picocli-4.7.6
13+
xmlgraphics-commons-2.9
14+
batik-anim-1.17
15+
batik-bridge-1.17
16+
batik-css-1.17
17+
batik-dom-1.17
18+
batik-gvt-1.17
19+
batik-transcoder-1.17
20+
batik-util-1.17
21+
batik-i18n-1.17
22+
batik-svg-dom-1.17
23+
batik-constants-1.17
24+
batik-ext-1.17
25+
batik-xml-1.17
26+
batik-parser-1.17
27+
batik-script-1.17
28+
batik-awt-util-1.17
29+
xml-apis-ext-1.3.04
30+
"
31+
3132
CLASSPATH=""
3233

3334
# AppDir structure
@@ -41,8 +42,8 @@ mkdir -p "$USR/share/icons/hicolor/scalable/apps"
4142
wget https://archive.apache.org/dist/xmlgraphics/batik/binaries/batik-bin-1.17.tar.gz -P "$DIR/assets"
4243
tar -xzf "$DIR/assets/batik-bin-1.17.tar.gz" -C "$DIR/assets"
4344

44-
for JAR in ${LIBS[@]}; do
45-
CLASSPATH+=":$USR/lib/$JAR.jar"
45+
for JAR in $LIBS; do
46+
CLASSPATH="$CLASSPATH:$USR/lib/$JAR.jar"
4647
mv "$BATIK/$JAR.jar" "$USR/lib"
4748
done
4849

0 commit comments

Comments
 (0)