Skip to content

Commit c3db071

Browse files
authored
Improve make_component.sh
1 parent 43d8779 commit c3db071

File tree

1 file changed

+19
-5
lines changed

1 file changed

+19
-5
lines changed

component/make_component.sh

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,29 @@
11
#!/usr/bin/env bash
2+
set -e
23

34
COMPONENT_DIR="component_temp_dir"
45
LANGUAGE_PATH="$COMPONENT_DIR/jre/languages/sl"
6+
SIMPLE_LANGUAGE_JAR="../language/target/simplelanguage.jar"
57
if [[ -f ../native/slnative ]]; then
68
INCLUDE_SLNATIVE="TRUE"
79
fi
810

9-
rm -rf COMPONENT_DIR
11+
if [[ -d $COMPONENT_DIR ]]; then
12+
local user_input
13+
read -p "'$COMPONENT_DIR' already exists. Do you want to remove it? (y/N): " user_input
14+
if [[ "${user_input}" != "y" ]]; then
15+
exit 0
16+
fi
17+
rm -rf "$COMPONENT_DIR"
18+
fi
19+
20+
if [[ ! -f $SIMPLE_LANGUAGE_JAR ]]; then
21+
echo "Could not find '$SIMPLE_LANGUAGE_JAR'. Did you run mvn package?"
22+
exit 1
23+
fi
1024

1125
mkdir -p "$LANGUAGE_PATH"
12-
cp ../language/target/simplelanguage.jar "$LANGUAGE_PATH"
26+
cp "$SIMPLE_LANGUAGE_JAR" "$LANGUAGE_PATH"
1327

1428
mkdir -p "$LANGUAGE_PATH/launcher"
1529
cp ../launcher/target/sl-launcher.jar "$LANGUAGE_PATH/launcher/"
@@ -29,7 +43,7 @@ echo "Bundle-Version: 1.0.0-rc14" >> "$MANIFEST"
2943
echo 'Bundle-RequireCapability: org.graalvm; filter:="(&(graalvm_version=1.0.0-rc14)(os_arch=amd64))"' >> "$MANIFEST"
3044
echo "x-GraalVM-Polyglot-Part: True" >> "$MANIFEST"
3145

32-
cd $COMPONENT_DIR
46+
pushd "$COMPONENT_DIR" > /dev/null
3347
jar cfm ../sl-component.jar META-INF/MANIFEST.MF .
3448

3549
echo "bin/sl = ../jre/languages/sl/bin/sl" > META-INF/symlinks
@@ -41,5 +55,5 @@ jar uf ../sl-component.jar META-INF/symlinks
4155
echo "jre/languages/sl/bin/sl = rwxrwxr-x" > META-INF/permissions
4256
echo "jre/languages/sl/bin/slnative = rwxrwxr-x" >> META-INF/permissions
4357
jar uf ../sl-component.jar META-INF/permissions
44-
cd ..
45-
rm -rf $COMPONENT_DIR
58+
popd > /dev/null
59+
rm -rf "$COMPONENT_DIR"

0 commit comments

Comments
 (0)