Skip to content

fix: terminal backup #1985

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
RohitKushvaha01 merged 7 commits into from
Mar 30, 2026
Merged

fix: terminal backup #1985

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
899429e
fix: backup
RohitKushvaha01 Mar 27, 2026
0c55bf6
Merge remote-tracking branch 'upstream/main'
RohitKushvaha01 Mar 27, 2026
5d4dde8
fix: backup
RohitKushvaha01 Mar 27, 2026
6258048
fix: backup
RohitKushvaha01 Mar 27, 2026
bfef562
fix: restore
RohitKushvaha01 Mar 28, 2026
d1f1cd5
fix: comment
RohitKushvaha01 Mar 28, 2026
de1274b
removed logging
RohitKushvaha01 Mar 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 6 additions & 11 deletions src/plugins/terminal/www/Terminal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down Expand Up @@ -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"
Expand All @@ -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"
`;

Expand Down Expand Up @@ -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"
Expand Down
14 changes: 7 additions & 7 deletions src/settings/terminalSettings.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,26 +325,26 @@ 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,
);

// 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(),
Expand Down