Skip to content

Commit bfef562

Browse files
fix: restore
1 parent 6258048 commit bfef562

File tree

1 file changed

+40
-32
lines changed

1 file changed

+40
-32
lines changed

src/plugins/terminal/www/Terminal.js

Lines changed: 40 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -260,39 +260,47 @@ const Terminal = {
260260
* Checks if alpine is already installed.
261261
* @returns {Promise<boolean>} - Returns true if all required files and directories exist.
262262
*/
263-
isInstalled() {
264-
return new Promise(async (resolve, reject) => {
265-
const filesDir = await new Promise((resolve, reject) => {
266-
system.getFilesDir(resolve, reject);
267-
});
263+
isInstalled() {
264+
return new Promise(async (resolve, reject) => {
265+
const filesDir = await new Promise((resolve, reject) => {
266+
system.getFilesDir(resolve, reject);
267+
});
268268

269-
const alpineExists = await new Promise((resolve, reject) => {
270-
system.fileExists(`${filesDir}/alpine`, false, (result) => {
271-
resolve(result == 1);
272-
}, reject);
273-
});
269+
console.log("[isInstalled] filesDir:", filesDir);
274270

275-
const downloaded = alpineExists && await new Promise((resolve, reject) => {
276-
system.fileExists(`${filesDir}/.downloaded`, false, (result) => {
277-
resolve(result == 1);
278-
}, reject);
279-
});
271+
const alpineExists = await new Promise((resolve, reject) => {
272+
system.fileExists(`${filesDir}/alpine`, false, (result) => {
273+
resolve(result == 1);
274+
}, reject);
275+
});
276+
console.log("[isInstalled] alpineExists:", alpineExists);
280277

281-
const extracted = alpineExists && await new Promise((resolve, reject) => {
282-
system.fileExists(`${filesDir}/.extracted`, false, (result) => {
283-
resolve(result == 1);
284-
}, reject);
285-
});
278+
const downloaded = alpineExists && await new Promise((resolve, reject) => {
279+
system.fileExists(`${filesDir}/.downloaded`, false, (result) => {
280+
resolve(result == 1);
281+
}, reject);
282+
});
283+
console.log("[isInstalled] downloaded:", downloaded);
286284

287-
const configured = alpineExists && await new Promise((resolve, reject) => {
288-
system.fileExists(`${filesDir}/.configured`, false, (result) => {
289-
resolve(result == 1);
290-
}, reject);
291-
});
285+
const extracted = alpineExists && await new Promise((resolve, reject) => {
286+
system.fileExists(`${filesDir}/.extracted`, false, (result) => {
287+
resolve(result == 1);
288+
}, reject);
289+
});
290+
console.log("[isInstalled] extracted:", extracted);
292291

293-
resolve(alpineExists && downloaded && extracted && configured);
292+
const configured = alpineExists && await new Promise((resolve, reject) => {
293+
system.fileExists(`${filesDir}/.configured`, false, (result) => {
294+
resolve(result == 1);
295+
}, reject);
294296
});
295-
},
297+
console.log("[isInstalled] configured:", configured);
298+
299+
const result = alpineExists && downloaded && extracted && configured;
300+
console.log("[isInstalled] final result:", result);
301+
resolve(result);
302+
});
303+
},
296304

297305
/**
298306
* Checks if the current device architecture is supported.
@@ -329,7 +337,7 @@ const Terminal = {
329337
}
330338
const cmd = `
331339
set -e
332-
INCLUDE_FILES="alpine .downloaded .extracted axs"
340+
INCLUDE_FILES="alpine .downloaded .extracted .configured axs"
333341
if [ "$FDROID" = "true" ]; then
334342
INCLUDE_FILES="$INCLUDE_FILES libtalloc.so.2 libproot-xed.so"
335343
fi
@@ -370,9 +378,9 @@ const Terminal = {
370378
}
371379

372380
const cmd = `
373-
sleep 2
381+
set -e
374382
375-
INCLUDE_FILES="$PREFIX/alpine $PREFIX/.downloaded $PREFIX/.extracted $PREFIX/axs"
383+
INCLUDE_FILES="$PREFIX/alpine $PREFIX/.downloaded $PREFIX/.extracted $PREFIX/.configured $PREFIX/axs"
376384
377385
if [ "$FDROID" = "true" ]; then
378386
INCLUDE_FILES="$INCLUDE_FILES $PREFIX/libtalloc.so.2 $PREFIX/libproot-xed.so"
@@ -382,7 +390,7 @@ const Terminal = {
382390
rm -rf -- "$item"
383391
done
384392
385-
tar -xf "$PREFIX/aterm_backup.*" -C "$PREFIX"
393+
tar -xf $PREFIX/aterm_backup.* -C "$PREFIX"
386394
echo "ok"
387395
`;
388396

@@ -420,7 +428,7 @@ const Terminal = {
420428
const cmd = `
421429
set -e
422430
423-
INCLUDE_FILES="$PREFIX/alpine $PREFIX/.downloaded $PREFIX/.extracted $PREFIX/axs"
431+
INCLUDE_FILES="$PREFIX/alpine $PREFIX/.downloaded $PREFIX/.extracted $PREFIX/.configured $PREFIX/axs"
424432
425433
if [ "$FDROID" = "true" ]; then
426434
INCLUDE_FILES="$INCLUDE_FILES $PREFIX/libtalloc.so.2 $PREFIX/libproot-xed.so"

0 commit comments

Comments
 (0)