Skip to content

Commit 8f9b096

Browse files
feat. improved logging + fix installation failure (#1446)
* feat. improved logging + fix installation failure * feat. added space between emojis * use sandbox in place of root
1 parent 80705fc commit 8f9b096

File tree

1 file changed

+14
-8
lines changed

1 file changed

+14
-8
lines changed

src/plugins/terminal/www/Terminal.js

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,8 @@ const Terminal = {
127127
throw new Error(`Unsupported architecture: ${arch}`);
128128
}
129129

130-
logger("Downloading files...");
131-
130+
131+
logger("⬇️ Downloading sandbox filesystem...");
132132
await new Promise((resolve, reject) => {
133133
cordova.plugin.http.downloadFile(
134134
alpineUrl, {}, {},
@@ -137,6 +137,7 @@ const Terminal = {
137137
);
138138
});
139139

140+
logger("⬇️ Downloading axs...");
140141
await new Promise((resolve, reject) => {
141142
cordova.plugin.http.downloadFile(
142143
axsUrl, {}, {},
@@ -147,7 +148,8 @@ const Terminal = {
147148

148149
const isFdroid = await Executor.execute("echo $FDROID");
149150
if (isFdroid === "true") {
150-
logger("Fdroid flavor detected, downloading extra files...");
151+
logger("🐧 F-Droid flavor detected, downloading additional files...");
152+
logger("⬇️ Downloading compatibility layer...");
151153
await new Promise((resolve, reject) => {
152154
cordova.plugin.http.downloadFile(
153155
prootUrl, {}, {},
@@ -156,6 +158,7 @@ const Terminal = {
156158
);
157159
});
158160

161+
logger("⬇️ Downloading supporting library...");
159162
await new Promise((resolve, reject) => {
160163
cordova.plugin.http.downloadFile(
161164
libTalloc, {}, {},
@@ -165,7 +168,9 @@ const Terminal = {
165168
});
166169
}
167170

168-
logger("✅ Download complete");
171+
logger("✅ All downloads completed");
172+
173+
logger("📁 Setting up directories...");
169174

170175
await new Promise((resolve, reject) => {
171176
system.mkdirs(`${filesDir}/.downloaded`, resolve, reject);
@@ -177,17 +182,18 @@ const Terminal = {
177182
system.mkdirs(alpineDir, resolve, reject);
178183
});
179184

180-
logger("Extracting...");
181-
await Executor.execute(`tar -xf ${filesDir}/alpine.tar.gz -C ${alpineDir}`);
185+
logger("📦 Extracting sandbox filesystem...");
186+
await Executor.execute(`tar --no-same-owner -xf ${filesDir}/alpine.tar.gz -C ${alpineDir}`);
182187

188+
logger("⚙️ Applying basic configuration...");
183189
system.writeText(`${alpineDir}/etc/resolv.conf`, `nameserver 8.8.4.4 \nnameserver 8.8.8.8`);
184190

185-
logger("✅ Extraction complete");
186-
191+
logger("✅ Extraction complete");
187192
await new Promise((resolve, reject) => {
188193
system.mkdirs(`${filesDir}/.extracted`, resolve, reject);
189194
});
190195

196+
logger("⚙️ Updating sandbox enviroment...");
191197
const installResult = await this.startAxs(true, logger, err_logger);
192198
return installResult;
193199

0 commit comments

Comments
 (0)