Skip to content

Commit 899429e

Browse files
fix: backup
1 parent fd0e833 commit 899429e

File tree

3 files changed

+18
-19
lines changed

3 files changed

+18
-19
lines changed

package-lock.json

Lines changed: 13 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/plugins/terminal/www/Terminal.js

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -327,21 +327,16 @@ const Terminal = {
327327
reject("Alpine is not installed.");
328328
return;
329329
}
330-
331330
const cmd = `
332331
set -e
333-
334332
INCLUDE_FILES="alpine .downloaded .extracted axs"
335333
if [ "$FDROID" = "true" ]; then
336334
INCLUDE_FILES="$INCLUDE_FILES libtalloc.so.2 libproot-xed.so"
337335
fi
338-
339-
EXCLUDE="--exclude=alpine/data --exclude=alpine/system --exclude=alpine/vendor --exclude=alpine/sdcard --exclude=alpine/storage --exclude=alpine/public"
340-
336+
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"
341337
tar -cf "$PREFIX/aterm_backup.tar" -C "$PREFIX" $EXCLUDE $INCLUDE_FILES
342338
echo "ok"
343339
`;
344-
345340
const result = await Executor.execute(cmd);
346341
if (result === "ok") {
347342
resolve(cordova.file.dataDirectory + "aterm_backup.tar");
@@ -387,7 +382,7 @@ const Terminal = {
387382
rm -rf -- "$item"
388383
done
389384
390-
tar -xf "$PREFIX/aterm_backup.bin" -C "$PREFIX"
385+
tar -xf "$PREFIX/aterm_backup.tar" -C "$PREFIX"
391386
echo "ok"
392387
`;
393388

src/settings/terminalSettings.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,7 @@ export default function terminalSettings() {
332332
await system.copyToUri(
333333
data.uri,
334334
cordova.file.dataDirectory,
335-
"aterm_backup",
335+
"aterm_backup.tar",
336336
console.log,
337337
console.error,
338338
);
@@ -341,7 +341,7 @@ export default function terminalSettings() {
341341
await Terminal.restore();
342342

343343
// Clean up
344-
const backupFilename = "aterm_backup.bin";
344+
const backupFilename = "aterm_backup.tar";
345345
const tempBackupPath = cordova.file.dataDirectory + backupFilename;
346346
const tempFS = fsOperation(tempBackupPath);
347347
await tempFS.delete();
@@ -352,7 +352,7 @@ export default function terminalSettings() {
352352
);
353353
},
354354
toast,
355-
"application/x-tar",
355+
"application/octet-stream",
356356
);
357357
} catch (error) {
358358
loader.removeTitleLoader();

0 commit comments

Comments
 (0)