status-im
/
status-react
mirror of https://github.com/status-im/status-react.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix generation of AppImage to point to Status instead of reportApp. Fixes #7128 

Signed-off-by: Vitaliy Vlasov <siphiuel@gmail.com>
This commit is contained in:
Pedro Pombeiro 2018-12-19 18:22:18 +01:00 committed by Vitaliy Vlasov
parent 112fe367cc
commit 897a8a60b8
No known key found for this signature in database
GPG Key ID: A7D57C347F2B2964
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
scripts/build-desktop.sh
View File

@ -78,8 +78,10 @@ function joinExistingPath() {
STATUSREACTPATH="$(cd "$SCRIPTPATH" && cd '..' && pwd)"
WORKFOLDER="$(joinExistingPath "$STATUSREACTPATH" 'StatusImPackage')"
DEPLOYQT="$(joinPath . 'linuxdeployqt-continuous-x86_64.AppImage')"
APPIMAGETOOL="$(joinPath . 'appimagetool-x86_64.AppImage')"
DEPLOYQTFNAME='linuxdeployqt-continuous-x86_64_20181215.AppImage'
APPIMAGETOOLFNAME='appimagetool-x86_64_20181109.AppImage'
DEPLOYQT=$(joinPath . "$DEPLOYQTFNAME")
APPIMAGETOOL=$(joinPath . "$APPIMAGETOOLFNAME")
STATUSIM_APPIMAGE_ARCHIVE="StatusImAppImage_20181208.zip"
function init() {
@ -300,12 +302,12 @@ function bundleLinux() {
cp ./desktop/bin/reportApp $usrBinPath
if [ ! -f $DEPLOYQT ]; then
wget --output-document="$DEPLOYQT" --show-progress -q https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage
wget --output-document="$DEPLOYQT" --show-progress "https://desktop-app-files.ams3.digitaloceanspaces.com/$DEPLOYQTFNAME" # Versioned from https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage
chmod a+x $DEPLOYQT
fi
if [ ! -f $APPIMAGETOOL ]; then
wget --output-document="$APPIMAGETOOL" --show-progress -q https://github.com/AppImage/AppImageKit/releases/download/10/appimagetool-x86_64.AppImage
wget --output-document="$APPIMAGETOOL" --show-progress "https://desktop-app-files.ams3.digitaloceanspaces.com/$APPIMAGETOOLFNAME" # Versioned from https://github.com/AppImage/AppImageKit/releases/download/10/appimagetool-x86_64.AppImage
chmod a+x $APPIMAGETOOL
fi
@ -313,20 +315,21 @@ function bundleLinux() {
rm -f Status-x86_64.AppImage
[ $VERBOSE_LEVEL -ge 1 ] && ldd $(joinExistingPath "$usrBinPath" 'Status')
$DEPLOYQT \
$(joinExistingPath "$usrBinPath" 'reportApp') \
-verbose=$VERBOSE_LEVEL -always-overwrite -no-strip -no-translations -qmake="$(joinExistingPath "${QTBIN}" 'qmake')" \
-qmldir="$STATUSREACTPATH/desktop/reportApp"
desktopFilePath="$(joinExistingPath "$WORKFOLDER" 'AppDir/usr/share/applications/Status.desktop')"
$DEPLOYQT \
$desktopFilePath \
-verbose=$VERBOSE_LEVEL -always-overwrite -no-strip \
-no-translations -bundle-non-qt-libs \
-executable="$usrBinPath/reportApp" \
-qmake="$qmakePath" \
-extra-plugins=imageformats/libqsvg.so \
-qmldir="$(joinExistingPath "$STATUSREACTPATH" 'node_modules/react-native')"
$DEPLOYQT \
$(joinExistingPath "$usrBinPath" 'reportApp') \
-verbose=$VERBOSE_LEVEL -always-overwrite -no-strip -no-translations -qmake="$qmakePath" \
-qmldir="$STATUSREACTPATH/desktop/reportApp"
pushd $WORKFOLDER
[ $VERBOSE_LEVEL -ge 1 ] && ldd AppDir/usr/bin/Status
cp -r assets/share/assets AppDir/usr/bin