daniel/MontaukOS
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: delete redundant 0:/common directory, remove dead 0:/home fallback in Music and Video apps

Browse Source
This commit is contained in:
Daniel Hammer
2026-05-28 20:41:16 +02:00
parent e17a8de844
commit 19b255d730
3 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
programs/GNUmakefile
+1 -9
View File
@@ -83,12 +83,9 @@ CONFIGDIR := data/config
CONFIGSRC := $(wildcard $(CONFIGDIR)/*.toml) CONFIGSRC := $(wildcard $(CONFIGDIR)/*.toml)
CONFIGDST := $(patsubst $(CONFIGDIR)/%,$(BINDIR)/config/%,$(CONFIGSRC)) CONFIGDST := $(patsubst $(CONFIGDIR)/%,$(BINDIR)/config/%,$(CONFIGSRC))
# Common shared assets (wallpapers, etc.)
COMMONKEEP := $(BINDIR)/common/.keep
.PHONY: all clean 2048 doom fetch wiki wikipedia weather imageviewer fontpreview spreadsheet wordprocessor pdfviewer disks devexplorer installer audio music video bluetooth network terminal klog procmgr calculator login desktop shell rpgdemo paint tcc lua screenshot texteditor mandelbrot printers timezone printd printctl dialogs icons fonts configs bearssl libc tls libjpeg libjpegwrite install-apps libloader libs libhello test_dialogs test_dl crashpad .PHONY: all clean 2048 doom fetch wiki wikipedia weather imageviewer fontpreview spreadsheet wordprocessor pdfviewer disks devexplorer installer audio music video bluetooth network terminal klog procmgr calculator login desktop shell rpgdemo paint tcc lua screenshot texteditor mandelbrot printers timezone printd printctl dialogs icons fonts configs bearssl libc tls libjpeg libjpegwrite install-apps libloader libs libhello test_dialogs test_dl crashpad
all: bearssl libc libjpeg libjpegwrite tls libloader libs libhello $(TARGETS) fetch wiki wikipedia weather imageviewer fontpreview spreadsheet wordprocessor pdfviewer disks devexplorer installer audio music video bluetooth network terminal klog procmgr calculator 2048 doom rpgdemo paint tcc lua screenshot texteditor mandelbrot printers timezone printd printctl dialogs login desktop shell icons fonts install-apps test_dialogs test_dl crashpad $(MANDST) $(WWWDST) $(CA_CERTS) $(CONFIGDST) $(COMMONKEEP) all: bearssl libc libjpeg libjpegwrite tls libloader libs libhello $(TARGETS) fetch wiki wikipedia weather imageviewer fontpreview spreadsheet wordprocessor pdfviewer disks devexplorer installer audio music video bluetooth network terminal klog procmgr calculator 2048 doom rpgdemo paint tcc lua screenshot texteditor mandelbrot printers timezone printd printctl dialogs login desktop shell icons fonts install-apps test_dialogs test_dl crashpad $(MANDST) $(WWWDST) $(CA_CERTS) $(CONFIGDST)
# Build BearSSL static library (cross-compiled for freestanding x86_64). # Build BearSSL static library (cross-compiled for freestanding x86_64).
BEARSSL_INCLUDES := -isystem $(shell cd .. && pwd)/kernel/freestnd-c-hdrs/x86_64/include -isystem $(abspath include/libc) BEARSSL_INCLUDES := -isystem $(shell cd .. && pwd)/kernel/freestnd-c-hdrs/x86_64/include -isystem $(abspath include/libc)
@@ -336,11 +333,6 @@ $(BINDIR)/config/%: $(CONFIGDIR)/%
mkdir -p $(BINDIR)/config mkdir -p $(BINDIR)/config
cp $< $@ cp $< $@
# Ensure common assets directory exists.
$(COMMONKEEP):
mkdir -p $(BINDIR)/common
touch $@
# Build each system program from its source files. # Build each system program from its source files.
$(BINDIR)/os/%.elf: src/%/main.cpp link.ld GNUmakefile $(BINDIR)/os/%.elf: src/%/main.cpp link.ld GNUmakefile
mkdir -p $(BINDIR)/os obj/$* mkdir -p $(BINDIR)/os obj/$*
programs/src/music/main.cpp
+1 -1
View File
@@ -1516,7 +1516,7 @@ extern "C" void _start() {
if (montauk::getuser(username, sizeof(username)) > 0 && username[0]) { if (montauk::getuser(username, sizeof(username)) > 0 && username[0]) {
snprintf(g.dir_path, sizeof(g.dir_path), "0:/users/%s/Music", username); snprintf(g.dir_path, sizeof(g.dir_path), "0:/users/%s/Music", username);
} else { } else {
memcpy(g.dir_path, "0:/home", 8); snprintf(g.dir_path, sizeof(g.dir_path), "0:/users");
} }
}; };
programs/src/video/main.cpp
+1 -1
View File
@@ -1260,7 +1260,7 @@ static void set_default_dir() {
snprintf(g.dir_path, sizeof(g.dir_path), "0:/users/%s", username); snprintf(g.dir_path, sizeof(g.dir_path), "0:/users/%s", username);
} }
} else { } else {
montauk::strncpy(g.dir_path, "0:/home", (int)sizeof(g.dir_path)); montauk::strncpy(g.dir_path, "0:/users", (int)sizeof(g.dir_path));
} }
} }