projects
/
citadel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
55a6d74
)
Added more exit points to build_appimage.sh so we know where it failed
author
Art Cancro
<ajc@citadel.org>
Tue, 6 Apr 2021 15:20:07 +0000
(11:20 -0400)
committer
Art Cancro
<ajc@citadel.org>
Tue, 6 Apr 2021 15:20:07 +0000
(11:20 -0400)
appimage/build_appimage.sh
patch
|
blob
|
history
diff --git
a/appimage/build_appimage.sh
b/appimage/build_appimage.sh
index ffb90af8932dfa9191b3b73ab1e0fb7e305edf03..eec8335b0e553a691c14e0c71da987b72ae1e240 100755
(executable)
--- a/
appimage/build_appimage.sh
+++ b/
appimage/build_appimage.sh
@@
-7,28
+7,28
@@
rm -fr $CITADEL_BUILD_DIR $WEBCIT_BUILD_DIR
# libcitadel has to be built in a "real" library directory
pushd ../libcitadel || exit 1
make distclean 2>/dev/null
# libcitadel has to be built in a "real" library directory
pushd ../libcitadel || exit 1
make distclean 2>/dev/null
-./bootstrap || exit
1
-./configure || exit
1
-make || exit
1
-make install || exit
1
+./bootstrap || exit
2
+./configure || exit
3
+make || exit
4
+make install || exit
5
popd
# Build the Citadel server
popd
# Build the Citadel server
-pushd ../citadel || exit
1
+pushd ../citadel || exit
6
make distclean 2>/dev/null
make distclean 2>/dev/null
-./bootstrap || exit
1
-./configure --prefix=$CITADEL_BUILD_DIR || exit
1
-make || exit
1
-make install || exit 1
+./bootstrap || exit
7
+./configure --prefix=$CITADEL_BUILD_DIR || exit
8
+make || exit
9
+make install || exit 1
0
popd
# Build WebCit
popd
# Build WebCit
-pushd ../webcit || exit 1
+pushd ../webcit || exit 1
1
make distclean 2>/dev/null
make distclean 2>/dev/null
-./bootstrap || exit 1
-./configure --prefix=$WEBCIT_BUILD_DIR || exit 1
-make || exit 1
-make install || exit 1
+./bootstrap || exit 1
2
+./configure --prefix=$WEBCIT_BUILD_DIR || exit 1
3
+make || exit 1
4
+make install || exit 1
5
popd
# Clear out any old versions in the AppDir
popd
# Clear out any old versions in the AppDir
@@
-49,21
+49,21
@@
ldconfig -v citadel.AppDir/usr/lib
# Copy over some utilities
for bin in db_dump db_load db_recover
do
# Copy over some utilities
for bin in db_dump db_load db_recover
do
- cp `which $bin` citadel.AppDir/usr/bin/
+ cp `which $bin` citadel.AppDir/usr/bin/
|| exit 16
done
# Install the Citadel Server application tree
done
# Install the Citadel Server application tree
-mkdir -p citadel.AppDir/usr/local/citadel
-rsync -va $CITADEL_BUILD_DIR/ ./citadel.AppDir/usr/local/citadel/
+mkdir -p citadel.AppDir/usr/local/citadel
|| exit 17
+rsync -va $CITADEL_BUILD_DIR/ ./citadel.AppDir/usr/local/citadel/
|| exit 18
# Install the WebCit application tree
# Install the WebCit application tree
-mkdir -p citadel.AppDir/usr/local/webcit
-rsync -va $WEBCIT_BUILD_DIR/ ./citadel.AppDir/usr/local/webcit/
+mkdir -p citadel.AppDir/usr/local/webcit
|| exit 19
+rsync -va $WEBCIT_BUILD_DIR/ ./citadel.AppDir/usr/local/webcit/
|| exit 20
# Remove the build directories
rm -fr $CITADEL_BUILD_DIR $WEBCIT_BUILD_DIR
# Remove the build directories
rm -fr $CITADEL_BUILD_DIR $WEBCIT_BUILD_DIR
-cc ctdlvisor.c -o citadel.AppDir/usr/bin/ctdlvisor || exit 1
+cc ctdlvisor.c -o citadel.AppDir/usr/bin/ctdlvisor || exit
2
1
cpu=`uname -p`
basefilename=citadel-`date +%s`
cpu=`uname -p`
basefilename=citadel-`date +%s`