File tree Expand file tree Collapse file tree
tooling/bundler/src/bundle/linux Expand file tree Collapse file tree Original file line number Diff line number Diff line change 1+ ---
2+ " tauri-bundler " : patch
3+ ---
4+
5+ Use binary arch instead of ` x86_64 ` on the AppImage bundle script.
Original file line number Diff line number Diff line change @@ -51,6 +51,7 @@ pub fn bundle_project(settings: &Settings) -> crate::Result<Vec<PathBuf>> {
5151
5252 // setup data to insert into shell script
5353 let mut sh_map = BTreeMap :: new ( ) ;
54+ sh_map. insert ( "arch" , settings. target ( ) . split ( '-' ) . next ( ) . unwrap ( ) ) ;
5455 sh_map. insert ( "app_name" , settings. main_binary_name ( ) ) ;
5556 sh_map. insert ( "app_name_uppercase" , & upcase_app_name) ;
5657 sh_map. insert ( "appimage_filename" , & appimage_filename) ;
Original file line number Diff line number Diff line change 55
66set -euxo pipefail
77
8- export ARCH=x86_64
8+ export ARCH={{arch}}
99
1010mkdir -p " {{app_name}}.AppDir"
1111cp -r ../appimage_deb/data/usr " {{app_name}}.AppDir"
@@ -17,7 +17,7 @@ find /usr/lib* -name WebKitNetworkProcess -exec mkdir -p "$(dirname '{}')" \; -e
1717find /usr/lib* -name WebKitWebProcess -exec mkdir -p " $( dirname ' {}' ) " \; -exec cp --parents ' {}' " ." \; || true
1818find /usr/lib* -name libwebkit2gtkinjectedbundle.so -exec mkdir -p " $( dirname ' {}' ) " \; -exec cp --parents ' {}' " ." \; || true
1919
20- wget -q -4 -O AppRun https://github.com/AppImage/AppImageKit/releases/download/continuous/AppRun-x86_64 || wget -q -4 -O AppRun https://github.com/AppImage/AppImageKit/releases/download/12/AppRun-aarch64
20+ wget -q -4 -O AppRun https://github.com/AppImage/AppImageKit/releases/download/continuous/AppRun-${ARCH} || wget -q -4 -O AppRun https://github.com/AppImage/AppImageKit/releases/download/12/AppRun-${ARCH}
2121chmod +x AppRun
2222
2323cp " {{icon_path}}" .DirIcon
@@ -28,9 +28,9 @@ ln -s "usr/share/applications/{{app_name}}.desktop" "{{app_name}}.desktop"
2828cd ..
2929
3030wget -q -4 -O linuxdeploy-plugin-gtk.sh " https://raw.githubusercontent.com/tauri-apps/linuxdeploy-plugin-gtk/master/linuxdeploy-plugin-gtk.sh"
31- wget -q -4 -O linuxdeploy-x86_64 .AppImage https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64 .AppImage
31+ wget -q -4 -O linuxdeploy-${ARCH} .AppImage https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-${ARCH} .AppImage
3232
3333chmod +x linuxdeploy-plugin-gtk.sh
34- chmod +x linuxdeploy-x86_64 .AppImage
34+ chmod +x linuxdeploy-${ARCH} .AppImage
3535
36- OUTPUT=" {{appimage_filename}}" ./linuxdeploy-x86_64 .AppImage --appimage-extract-and-run --appdir " {{app_name}}.AppDir" --plugin gtk --output appimage
36+ OUTPUT=" {{appimage_filename}}" ./linuxdeploy-${ARCH} .AppImage --appimage-extract-and-run --appdir " {{app_name}}.AppDir" --plugin gtk --output appimage
You can’t perform that action at this time.
0 commit comments