Skip to content

Commit 21c087e

Browse files
mahor1221mahor1221
authored
Tidy up bundler script (#380)
* Tidy up bundler script * Update paths * Remove -e * Revert "Remove -e" This reverts commit 1e29293.
1 parent bdf3a70 commit 21c087e

File tree

2 files changed

+138
-113
lines changed

2 files changed

+138
-113
lines changed

‎scripts/bundler.sh

+128-103
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,11 @@
88

99
main() {
1010
POSITIONAL_ARGS=()
11-
DOWNLOAD_ONLY=false
1211
OUTPUT_DIR=.
1312
while [ "$#" -gt 0 ]; do
1413
case "$1" in
1514
-o|--output-dir)
16-
OUTPUT_DIR="$(readlink -e "$2")"
15+
OUTPUT_DIR="$(readlink -e "$2" || exit 1)"
1716
shift
1817
shift
1918
;;
@@ -23,76 +22,93 @@ main() {
2322
;;
2423
esac
2524
done
26-
set -- "${POSITIONAL_ARGS[@]}" # restore positional parameters
25+
# restore positional parameters
26+
set -- "${POSITIONAL_ARGS[@]}"
2727

2828
OS="$1"
29-
jar="$(ls server/build/*.jar | tail -n1)"
30-
release_name="$(echo "${jar%.*}" | sed 's/.jar//' | xargs basename)-$OS"
31-
release_version="$(tmp="${jar%-*}"; echo "${tmp##*-}" | tr -d v)"
32-
#local release_revision_number="$(tmp="${jar%.*}" && echo "${tmp##*-}" | tr -d r)"
33-
electron_version="v14.0.0"
29+
JAR="$(ls server/build/*.jar | tail -n1)"
30+
RELEASE_NAME="$(echo "${JAR%.*}" | xargs basename)-$OS"
31+
RELEASE_VERSION="$(tmp="${JAR%-*}"; echo "${tmp##*-}" | tr -d v)"
32+
#RELEASE_REVISION_NUMBER="$(tmp="${JAR%.*}" && echo "${tmp##*-}" | tr -d r)"
33+
local electron_version="v14.0.0"
3434

3535
# clean temporary directory on function return
36-
trap "rm -rf $release_name/" RETURN
37-
mkdir "$release_name/"
36+
trap "rm -rf $RELEASE_NAME/" RETURN
37+
mkdir "$RELEASE_NAME/"
3838

3939
case "$OS" in
4040
debian-all)
41+
RELEASE="$RELEASE_NAME.deb"
4142
make_deb_package
4243
move_release_to_output_dir
4344
;;
4445
linux-all)
45-
make_linux_bundle
46+
RELEASE="$RELEASE_NAME.tar.gz"
47+
cp "$JAR" "$RELEASE_NAME/tachidesk-server.jar"
48+
copy_linux_package_assets_to "$RELEASE_NAME/"
49+
tar -I "gzip -9" -cvf "$RELEASE" "$RELEASE_NAME/"
4650
move_release_to_output_dir
4751
;;
4852
linux-x64)
49-
jre="OpenJDK8U-jre_x64_linux_hotspot_8u302b08.tar.gz"
50-
jre_url="https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u302-b08/$jre"
51-
electron="electron-$electron_version-linux-x64.zip"
52-
electron_url="https://github.com/electron/electron/releases/download/$electron_version/$electron"
53+
JRE="OpenJDK8U-jre_x64_linux_hotspot_8u302b08.tar.gz"
54+
JRE_URL="https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u302-b08/$JRE"
55+
ELECTRON="electron-$electron_version-linux-x64.zip"
56+
ELECTRON_URL="https://github.com/electron/electron/releases/download/$electron_version/$ELECTRON"
5357
download_jre_and_electron
58+
59+
RELEASE="$RELEASE_NAME.tar.gz"
5460
make_linux_bundle
5561
move_release_to_output_dir
5662
;;
5763
macOS-x64)
58-
jre="OpenJDK8U-jre_x64_mac_hotspot_8u302b08.tar.gz"
59-
jre_url="https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u302-b08/$jre"
60-
electron="electron-$electron_version-darwin-x64.zip"
61-
electron_url="https://github.com/electron/electron/releases/download/$electron_version/$electron"
64+
JRE="OpenJDK8U-jre_x64_mac_hotspot_8u302b08.tar.gz"
65+
JRE_URL="https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u302-b08/$JRE"
66+
ELECTRON="electron-$electron_version-darwin-x64.zip"
67+
ELECTRON_URL="https://github.com/electron/electron/releases/download/$electron_version/$ELECTRON"
6268
download_jre_and_electron
69+
70+
RELEASE="$RELEASE_NAME.zip"
6371
make_macos_bundle
6472
move_release_to_output_dir
6573
;;
6674
macOS-arm64)
67-
jre="zulu8.56.0.23-ca-jre8.0.302-macosx_aarch64.tar.gz"
68-
jre_url="https://cdn.azul.com/zulu/bin/$jre"
69-
electron="electron-$electron_version-darwin-arm64.zip"
70-
electron_url="https://github.com/electron/electron/releases/download/$electron_version/$electron"
75+
JRE="zulu8.56.0.23-ca-jre8.0.302-macosx_aarch64.tar.gz"
76+
JRE_URL="https://cdn.azul.com/zulu/bin/$JRE"
77+
ELECTRON="electron-$electron_version-darwin-arm64.zip"
78+
ELECTRON_URL="https://github.com/electron/electron/releases/download/$electron_version/$ELECTRON"
7179
download_jre_and_electron
80+
81+
RELEASE="$RELEASE_NAME.zip"
7282
make_macos_bundle
7383
move_release_to_output_dir
7484
;;
7585
windows-x86)
76-
jre="OpenJDK8U-jre_x86-32_windows_hotspot_8u292b10.zip"
77-
jre_url="https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/$jre"
78-
electron="electron-$electron_version-win32-ia32.zip"
79-
electron_url="https://github.com/electron/electron/releases/download/$electron_version/$electron"
86+
JRE="OpenJDK8U-jre_x86-32_windows_hotspot_8u292b10.zip"
87+
JRE_URL="https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/$JRE"
88+
ELECTRON="electron-$electron_version-win32-ia32.zip"
89+
ELECTRON_URL="https://github.com/electron/electron/releases/download/$electron_version/$ELECTRON"
8090
download_jre_and_electron
91+
92+
RELEASE="$RELEASE_NAME.zip"
8193
make_windows_bundle
8294
move_release_to_output_dir
8395

96+
RELEASE="$RELEASE_NAME.msi"
8497
make_windows_package
8598
move_release_to_output_dir
8699
;;
87100
windows-x64)
88-
jre="OpenJDK8U-jre_x64_windows_hotspot_8u302b08.zip"
89-
jre_url="https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u302-b08/$jre"
90-
electron="electron-$electron_version-win32-x64.zip"
91-
electron_url="https://github.com/electron/electron/releases/download/$electron_version/$electron"
101+
JRE="OpenJDK8U-jre_x64_windows_hotspot_8u302b08.zip"
102+
JRE_URL="https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u302-b08/$JRE"
103+
ELECTRON="electron-$electron_version-win32-x64.zip"
104+
ELECTRON_URL="https://github.com/electron/electron/releases/download/$electron_version/$ELECTRON"
92105
download_jre_and_electron
106+
107+
RELEASE="$RELEASE_NAME.zip"
93108
make_windows_bundle
94109
move_release_to_output_dir
95110

111+
RELEASE="$RELEASE_NAME.msi"
96112
make_windows_package
97113
move_release_to_output_dir
98114
;;
@@ -104,86 +120,96 @@ main() {
104120

105121
move_release_to_output_dir() {
106122
# clean up from possible previous runs
107-
if [ -f "$OUTPUT_DIR/$release" ]; then
108-
rm "$OUTPUT_DIR/$release"
123+
if [ -f "$OUTPUT_DIR/$RELEASE" ]; then
124+
rm "$OUTPUT_DIR/$RELEASE"
109125
fi
110-
mv "$release" "$OUTPUT_DIR/"
126+
mv "$RELEASE" "$OUTPUT_DIR/"
111127
}
112128

113129
download_jre_and_electron() {
114-
if [ ! -f "$jre" ]; then
115-
curl -L "$jre_url" -o "$jre"
130+
if [ ! -f "$JRE" ]; then
131+
curl -L "$JRE_URL" -o "$JRE"
116132
fi
117-
if [ ! -f "$electron" ]; then
118-
curl -L "$electron_url" -o "$electron"
133+
if [ ! -f "$ELECTRON" ]; then
134+
curl -L "$ELECTRON_URL" -o "$ELECTRON"
119135
fi
120136

121-
mkdir -p "$release_name/jre/"
122-
local ext="${jre##*.}"
137+
mkdir -p "$RELEASE_NAME/jre/"
138+
local ext="${JRE##*.}"
139+
local jre_dir
123140
if [ "$ext" = "zip" ]; then
124-
jre_dir="$(unzip "$jre" | sed -n '2p' | cut -d: -f2 | xargs basename)"
125-
mv "$jre_dir" "$release_name/jre"
141+
jre_dir="$(unzip "$JRE" | sed -n '2p' | cut -d: -f2 | xargs basename)"
142+
mv "$jre_dir" "$RELEASE_NAME/jre"
126143
else
127144
# --strip-components=1: untar an archive without the root folder
128-
tar xvf "$jre" --strip-components=1 -C "$release_name/jre/"
145+
tar xvf "$JRE" --strip-components=1 -C "$RELEASE_NAME/jre/"
129146
fi
130-
unzip "$electron" -d "$release_name/electron/"
147+
unzip "$ELECTRON" -d "$RELEASE_NAME/electron/"
131148
}
132149

133-
make_linux_bundle() {
134-
cp "$jar" "$release_name/tachidesk-server.jar"
135-
cp "scripts/resources/tachidesk-server-browser-launcher.sh" "$release_name/"
136-
cp "scripts/resources/tachidesk-server-debug-launcher.sh" "$release_name/"
137-
cp "scripts/resources/tachidesk-server-electron-launcher.sh" "$release_name/"
138-
cp "scripts/resources/tachidesk-server.desktop" "$release_name/"
150+
copy_linux_package_assets_to() {
151+
local output_dir
152+
output_dir="$(readlink -e "$1" || exit 1)"
153+
154+
cp "scripts/resources/tachidesk-server-browser-launcher.sh" "$output_dir/"
155+
cp "scripts/resources/tachidesk-server-debug-launcher.sh" "$output_dir/"
156+
cp "scripts/resources/tachidesk-server-electron-launcher.sh" "$output_dir/"
157+
cp "scripts/resources/tachidesk-server.desktop" "$output_dir/"
158+
cp "scripts/resources/systemd"/* "$output_dir/"
139159
cp "server/src/main/resources/icon/faviconlogo.png" \
140-
"$release_name/tachidesk-server.png"
141-
cp "scripts/resources/systemd"/* "$release_name/"
160+
"$output_dir/tachidesk-server.png"
161+
}
142162

143-
release="$release_name.tar.gz"
144-
tar -I "gzip -9" -cvf "$release" "$release_name/"
163+
make_linux_bundle() {
164+
cp "$JAR" "$RELEASE_NAME/tachidesk-server.jar"
165+
cp "scripts/resources/tachidesk-server-browser-launcher.sh" "$RELEASE_NAME/"
166+
cp "scripts/resources/tachidesk-server-debug-launcher.sh" "$RELEASE_NAME/"
167+
cp "scripts/resources/tachidesk-server-electron-launcher.sh" "$RELEASE_NAME/"
168+
169+
tar -I "gzip -9" -cvf "$RELEASE" "$RELEASE_NAME/"
145170
}
146171

147172
make_macos_bundle() {
148-
cp "$jar" "$release_name/Tachidesk.jar"
149-
cp "scripts/resources/Tachidesk Browser Launcher.command" "$release_name/"
150-
cp "scripts/resources/Tachidesk Debug Launcher.command" "$release_name/"
151-
cp "scripts/resources/Tachidesk Electron Launcher.command" "$release_name/"
173+
cp "$JAR" "$RELEASE_NAME/Tachidesk.jar"
174+
cp "scripts/resources/Tachidesk Browser Launcher.command" "$RELEASE_NAME/"
175+
cp "scripts/resources/Tachidesk Debug Launcher.command" "$RELEASE_NAME/"
176+
cp "scripts/resources/Tachidesk Electron Launcher.command" "$RELEASE_NAME/"
152177

153-
release="$release_name.zip"
154-
zip -9 -r "$release" "$release_name/"
178+
zip -9 -r "$RELEASE" "$RELEASE_NAME/"
155179
}
156180

157181
# https://wiki.debian.org/SimplePackagingTutorial
158182
# https://www.debian.org/doc/manuals/packaging-tutorial/packaging-tutorial.pdf
159183
make_deb_package() {
160-
make_linux_bundle "$release_name" "$jar"
161-
cp -r "scripts/resources/deb/" "$release_name/debian/"
162-
sed -i "s/\$pkgver/$release_version/" "$release_name/debian/changelog"
163-
sed -i "s/\$pkgrel/1/" "$release_name/debian/changelog"
164-
165-
# clean temporary directory on function return
166-
local temp_dir="$(mktemp -d)"
184+
local temp_dir
185+
temp_dir="$(mktemp -d)"
167186
trap "rm -rf $temp_dir" RETURN
168187

169-
#behind $release_version is underscore "_"
170-
local source_dir="tachidesk-server-$release_version"
171-
local upstream_source="tachidesk-server_$release_version.orig.tar.gz"
172-
mv "$release_name/" "$temp_dir/$source_dir/"
173-
mv "$release_name.tar.gz" "$temp_dir/$upstream_source"
188+
cp "$JAR" "$RELEASE_NAME/tachidesk-server.jar"
189+
tar -I "gzip" -cvf "$RELEASE_NAME.tar.gz" "$RELEASE_NAME/"
190+
#behind $RELEASE_VERSION is underscore "_"
191+
local upstream_source="tachidesk-server_$RELEASE_VERSION.orig.tar.gz"
192+
mv "$RELEASE_NAME.tar.gz" "$temp_dir/$upstream_source"
193+
194+
cp -r "scripts/resources/deb/" "$RELEASE_NAME/debian/"
195+
copy_linux_package_assets_to "$RELEASE_NAME/debian/"
196+
sed -i "s/\$pkgver/$RELEASE_VERSION/" "$RELEASE_NAME/debian/changelog"
197+
sed -i "s/\$pkgrel/1/" "$RELEASE_NAME/debian/changelog"
198+
#behind $RELEASE_VERSION is hyphen "-"
199+
local source_dir="tachidesk-server-$RELEASE_VERSION"
200+
mv "$RELEASE_NAME/" "$temp_dir/$source_dir/"
174201

175202
sudo apt install devscripts build-essential dh-exec
176-
cd "$temp_dir/$source_dir"
203+
cd "$temp_dir/$source_dir/"
177204
dpkg-buildpackage --no-sign --build=all
178205
cd -
179206

180-
local deb="tachidesk-server_$release_version-1_all.deb"
181-
release="$release_name.deb"
182-
mv "$temp_dir/$deb" "$release"
207+
local deb="tachidesk-server_$RELEASE_VERSION-1_all.deb"
208+
mv "$temp_dir/$deb" "$RELEASE"
183209
}
184210

185211
make_windows_bundle() {
186-
## I'll disable this section until someone find a solution to this error:
212+
## I disabled this section until someone find a solution to this error:
187213
##E: Unable to correct problems, you have held broken packages.
188214
##./bundler.sh: line 250: wine: command not found
189215

@@ -207,38 +233,36 @@ make_windows_bundle() {
207233
#curl -L "$rcedit_url" -o "$rcedit"
208234
#fi
209235

210-
local icon="server/src/main/resources/icon/faviconlogo.ico"
211-
#WINEARCH=win32 wine "$rcedit" "$release_name/electron/electron.exe" \
236+
#local icon="server/src/main/resources/icon/faviconlogo.ico"
237+
#WINEARCH=win32 wine "$rcedit" "$RELEASE_NAME/electron/electron.exe" \
212238
# --set-icon "$icon"
213239

214-
cp "$jar" "$release_name/Tachidesk.jar"
215-
cp "scripts/resources/Tachidesk Browser Launcher.bat" "$release_name"
216-
cp "scripts/resources/Tachidesk Debug Launcher.bat" "$release_name"
217-
cp "scripts/resources/Tachidesk Electron Launcher.bat" "$release_name"
240+
cp "$JAR" "$RELEASE_NAME/Tachidesk.jar"
241+
cp "scripts/resources/Tachidesk Browser Launcher.bat" "$RELEASE_NAME"
242+
cp "scripts/resources/Tachidesk Debug Launcher.bat" "$RELEASE_NAME"
243+
cp "scripts/resources/Tachidesk Electron Launcher.bat" "$RELEASE_NAME"
218244

219-
release="$release_name.zip"
220-
zip -9 -r "$release" "$release_name"
245+
zip -9 -r "$RELEASE" "$RELEASE_NAME"
221246
}
222247

223248
make_windows_package() {
224249
if [ "$CI" = true ]; then
225250
sudo apt install -y wixl
226251
fi
227252

228-
find "$release_name/jre" \
229-
| wixl-heat --var var.SourceDir -p "$release_name/" \
230-
--directory-ref jre --component-group jre >"$release_name/jre.wxs"
231-
find "$release_name/electron" \
232-
| wixl-heat --var var.SourceDir -p "$release_name/" \
233-
--directory-ref electron --component-group electron >"$release_name/electron.wxs"
253+
find "$RELEASE_NAME/jre" \
254+
| wixl-heat --var var.SourceDir -p "$RELEASE_NAME/" \
255+
--directory-ref jre --component-group jre >"$RELEASE_NAME/jre.wxs"
256+
find "$RELEASE_NAME/electron" \
257+
| wixl-heat --var var.SourceDir -p "$RELEASE_NAME/" \
258+
--directory-ref electron --component-group electron >"$RELEASE_NAME/electron.wxs"
234259

235260
local icon="server/src/main/resources/icon/faviconlogo.ico"
236261
local arch=${OS##*-}
237-
release="$release_name.msi"
238262

239-
wixl -D ProductVersion="$release_version" -D SourceDir="$release_name" \
263+
wixl -D ProductVersion="$RELEASE_VERSION" -D SourceDir="$RELEASE_NAME" \
240264
-D Icon="$icon" --arch "$arch" "scripts/resources/msi/tachidesk-server-$arch.wxs" \
241-
"$release_name/jre.wxs" "$release_name/electron.wxs" -o "$release"
265+
"$RELEASE_NAME/jre.wxs" "$RELEASE_NAME/electron.wxs" -o "$RELEASE"
242266
}
243267

244268
# Error handler
@@ -252,17 +276,18 @@ make_windows_package() {
252276
# and http://mywiki.wooledge.org/BashFAO/105
253277
set -euo pipefail
254278
error() {
255-
local parent_lineno="$1"
256-
local message="$2"
257-
local code="${3:-1}"
258-
if [ -z "$message" ]; then
259-
echo "$0: line $parent_lineno: exiting with status $code"
260-
else
261-
echo "$0: line $parent_lineno: $message: exiting with status $code"
262-
fi
263-
exit "$code"
279+
local parent_lineno="$1"
280+
local message="$2"
281+
local code="${3:-1}"
282+
if [ -z "$message" ]; then
283+
echo "$0: line $parent_lineno: exiting with status $code"
284+
else
285+
echo "$0: line $parent_lineno: $message: exiting with status $code"
286+
fi
287+
exit "$code"
264288
}
265289
trap 'error $LINENO ""' ERR
266290

267291
main "$@"; exit
268292

293+

‎scripts/resources/deb/install

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
#!/usr/bin/dh-exec
22

3-
tachidesk-server.jar usr/share/java/tachidesk-server/
4-
tachidesk-server.png usr/share/pixmaps/
5-
tachidesk-server.desktop usr/share/applications/
6-
tachidesk-server.service usr/lib/systemd/system/
7-
tachidesk-server.sysusers => usr/lib/sysusers.d/tachidesk-server.conf
8-
tachidesk-server.tmpfiles => usr/lib/tmpfiles.d/tachidesk-server.conf
9-
tachidesk-server.conf => etc/tachidesk/server.conf
10-
tachidesk-server-browser-launcher.sh => usr/bin/tachidesk-server-browser
11-
tachidesk-server-debug-launcher.sh => usr/bin/tachidesk-server-debug
12-
tachidesk-server-electron-launcher.sh => usr/bin/tachidesk-server-electron
3+
tachidesk-server.jar usr/share/java/tachidesk-server/
4+
debian/tachidesk-server.png usr/share/pixmaps/
5+
debian/tachidesk-server.desktop usr/share/applications/
6+
debian/tachidesk-server.service usr/lib/systemd/system/
7+
debian/tachidesk-server.sysusers => usr/lib/sysusers.d/tachidesk-server.conf
8+
debian/tachidesk-server.tmpfiles => usr/lib/tmpfiles.d/tachidesk-server.conf
9+
debian/tachidesk-server.conf => etc/tachidesk/server.conf
10+
debian/tachidesk-server-browser-launcher.sh => usr/bin/tachidesk-server-browser
11+
debian/tachidesk-server-debug-launcher.sh => usr/bin/tachidesk-server-debug
12+
debian/tachidesk-server-electron-launcher.sh => usr/bin/tachidesk-server-electron

0 commit comments

Comments
 (0)