diff --git a/src/plugins/terminal/www/Terminal.js b/src/plugins/terminal/www/Terminal.js index d63c29c16..61512062c 100644 --- a/src/plugins/terminal/www/Terminal.js +++ b/src/plugins/terminal/www/Terminal.js @@ -327,21 +327,16 @@ const Terminal = { reject("Alpine is not installed."); return; } - const cmd = ` set -e - - INCLUDE_FILES="alpine .downloaded .extracted axs" + INCLUDE_FILES="alpine .downloaded .extracted .configured axs" if [ "$FDROID" = "true" ]; then INCLUDE_FILES="$INCLUDE_FILES libtalloc.so.2 libproot-xed.so" fi - - EXCLUDE="--exclude=alpine/data --exclude=alpine/system --exclude=alpine/vendor --exclude=alpine/sdcard --exclude=alpine/storage --exclude=alpine/public" - + EXCLUDE="--exclude=alpine/data --exclude=alpine/system --exclude=alpine/vendor --exclude=alpine/sdcard --exclude=alpine/storage --exclude=alpine/public --exclude=alpine/apex --exclude=alpine/odm --exclude=alpine/product --exclude=alpine/system_ext --exclude=alpine/linkerconfig --exclude=alpine/proc --exclude=alpine/sys --exclude=alpine/dev --exclude=alpine/run --exclude=alpine/tmp" tar -cf "$PREFIX/aterm_backup.tar" -C "$PREFIX" $EXCLUDE $INCLUDE_FILES echo "ok" `; - const result = await Executor.execute(cmd); if (result === "ok") { resolve(cordova.file.dataDirectory + "aterm_backup.tar"); @@ -375,9 +370,9 @@ const Terminal = { } const cmd = ` - sleep 2 + set -e - INCLUDE_FILES="$PREFIX/alpine $PREFIX/.downloaded $PREFIX/.extracted $PREFIX/axs" + INCLUDE_FILES="$PREFIX/alpine $PREFIX/.downloaded $PREFIX/.extracted $PREFIX/.configured $PREFIX/axs" if [ "$FDROID" = "true" ]; then INCLUDE_FILES="$INCLUDE_FILES $PREFIX/libtalloc.so.2 $PREFIX/libproot-xed.so" @@ -387,7 +382,7 @@ const Terminal = { rm -rf -- "$item" done - tar -xf "$PREFIX/aterm_backup.bin" -C "$PREFIX" + tar -xf $PREFIX/aterm_backup.* -C "$PREFIX" echo "ok" `; @@ -425,7 +420,7 @@ const Terminal = { const cmd = ` set -e - INCLUDE_FILES="$PREFIX/alpine $PREFIX/.downloaded $PREFIX/.extracted $PREFIX/axs" + INCLUDE_FILES="$PREFIX/alpine $PREFIX/.downloaded $PREFIX/.extracted $PREFIX/.configured $PREFIX/axs" if [ "$FDROID" = "true" ]; then INCLUDE_FILES="$INCLUDE_FILES $PREFIX/libtalloc.so.2 $PREFIX/libproot-xed.so" diff --git a/src/settings/terminalSettings.js b/src/settings/terminalSettings.js index ca435600e..15cbcbe0f 100644 --- a/src/settings/terminalSettings.js +++ b/src/settings/terminalSettings.js @@ -325,14 +325,16 @@ export default function terminalSettings() { */ async function terminalRestore() { try { + await Executor.execute("rm -rf $PREFIX/aterm_backup.*"); + sdcard.openDocumentFile( async (data) => { loader.showTitleLoader(); - //this will create a file at $PREFIX/atem_backup.bin + //this will create a file at $PREFIX/atem_backup.tar.tar await system.copyToUri( data.uri, cordova.file.dataDirectory, - "aterm_backup", + "aterm_backup.tar", console.log, console.error, ); @@ -340,11 +342,9 @@ export default function terminalSettings() { // Restore await Terminal.restore(); - // Clean up - const backupFilename = "aterm_backup.bin"; - const tempBackupPath = cordova.file.dataDirectory + backupFilename; - const tempFS = fsOperation(tempBackupPath); - await tempFS.delete(); + //Cleanup restore file + await Executor.execute("rm -rf $PREFIX/aterm_backup.*"); + loader.removeTitleLoader(); alert( strings.success.toUpperCase(),