X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=appimage%2Fbuild_appimage.sh;h=28d24eccb7c55509a4949e6598dea77f81eece6c;hb=a69cc33c04719fd0ce234584c668139a34c20cc7;hp=2c642ea21037d6e8d524257ec3845ccec9f77bd7;hpb=8dc662496f6156cbfe7f49e392efa707572151bf;p=citadel.git

diff --git a/appimage/build_appimage.sh b/appimage/build_appimage.sh
index 2c642ea21..28d24eccb 100755
--- 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
-./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
-pushd ../citadel || exit 1
+pushd ../citadel || exit 6
 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 10
 popd
 
 # Build WebCit
-pushd ../webcit || exit 1
+pushd ../webcit || exit 11
 make distclean 2>/dev/null
-./bootstrap || exit 1
-./configure --prefix=$WEBCIT_BUILD_DIR || exit 1
-make || exit 1
-make install || exit 1
+./bootstrap || exit 12
+./configure --prefix=$WEBCIT_BUILD_DIR || exit 13
+make || exit 14
+make install || exit 15
 popd
 
 # Clear out any old versions in the AppDir
@@ -46,23 +46,32 @@ do
 done
 ldconfig -v citadel.AppDir/usr/lib
 
+# Copy over some utilities
+for bin in db_dump db_load db_recover
+do
+	cp `which $bin` citadel.AppDir/usr/bin/	|| exit 16
+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
-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
 
-cc ctdlvisor.c -o citadel.AppDir/usr/bin/ctdlvisor || exit 1
+cc ctdlvisor.c -o citadel.AppDir/usr/bin/ctdlvisor || exit 21
 
-cpu=`uname -p`
+CPU=`uname -m`
 basefilename=citadel-`date +%s`
-if [ $cpu == x86_64 ] ; then
-	ARCH=x86_64 appimagetool citadel.AppDir/ ${basefilename}-x64.appimage
-else
-	ARCH=ARM appimagetool citadel.AppDir/ ${basefilename}-arm32.appimage
+if [ $CPU == x86_64 ] ; then
+	export ARCH=x86_64
+elif [ $CPU == armv7l ] ; then
+	export ARCH=ARM
 fi
+echo ARCH: $ARCH
+echo CPU: $CPU
+appimagetool citadel.AppDir/ ${basefilename}-${CPU}.appimage