Aren/toaruos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

msk: Fixup support for multiple remotes, add a few options

Browse Source
This commit is contained in:
K. Lange 2021-10-28 06:15:35 +09:00
parent b735d0f04e
commit 6f92d789a0
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/msk.c
View File

@ -209,7 +209,7 @@ static int update_stores(int argc, char * argv[]) {
sprintf(cmd, "fetch -vo /tmp/.msk_remote_%s %s/manifest", remote_name, remote_path);
fprintf(stderr, "Downloading remote manifest '%s'...\n", remote_name);
if (system(cmd)) {
fprintf(stderr, "Error loading remote '%s' from '%s'.\n", remote_name, remote_path);
fprintf(stderr, "Skipping unavailable remote manifest '%s' (%s).\n", remote_name, remote_path);
goto _next;
}
sprintf(cmd, "/tmp/.msk_remote_%s", remote_name);
@ -242,7 +242,7 @@ static int update_stores(int argc, char * argv[]) {
one_success = 1;
_next:
tok = strtok_r(NULL, " ", &save);
tok = strtok_r(NULL, ",", &save);
} while (tok);
free(order);

9
base/etc/msk.conf
View File

@ -1,6 +1,7 @@
remote_order=local,remote
remote_order=cdrom,local,cdn,fallback
[remotes]
local=/cdrom/extra
#remote=http://toaruos.org/msk/2.0.x
remote=http://toaruos.sfo3.cdn.digitaloceanspaces.com/msk/2.0.x
cdrom=/cdrom/extra
local=http://10.0.2.2:8080
fallback=http://toaruos.org/msk/2.0.x
cdn=http://toaruos.sfo3.cdn.digitaloceanspaces.com/msk/2.0.x