mirrors
/
netsurf
mirror of https://github.com/netsurf-browser/netsurf
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use 'user' env-var to determine username 

svn path=/trunk/netsurf/; revision=13778
This commit is contained in:
Chris Young 2012-03-30 18:18:15 +00:00
parent 5a42a7a791
commit e30905be75
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
amiga/dist/Install vendored
View File

@ -363,7 +363,12 @@
(complete 15)
(set #options-exist (exists (tackon @default-dest "Users/Default/Choices")))
(set #user (getenv "user"))
(if (= #user "") (set #user "Default"))
(set #user-dir (tackon (tackon @default-dest "Users") #user))
(set #user-options (tackon #user-dir "Choices"))
(set #options-exist (exists #user-options))
(set #searchengines-exist (exists (tackon @default-dest "Resources/SearchEngines")))
(set #aiss-theme "")
@ -518,12 +523,12 @@
)
)
(makedir (tackon @default-dest "Users/Default"))
(makedir #user-dir)
(textfile
(prompt "Setting default options")
(help @textfile-help)
(dest (tackon @default-dest "Users/Default/Choices"))
(dest #user-options)
(append "theme:" #theme "\n")
(append "use_pubscreen:Workbench\n")
)

9
amiga/gui.c
View File

@ -819,11 +819,18 @@ int main(int argc, char** argv)
char messages[100];
char script[1024];
char temp[1024];
BPTR lock = 0;
int32 user = 0;
Object *splash_window = ami_gui_splash_open();
current_user = ASPrintf("Default");
user = GetVar("user", temp, 1024, GVF_GLOBAL_ONLY);
current_user = ASPrintf("%s", (user == -1) ? "Default" : temp);
current_user_dir = ASPrintf("PROGDIR:Users/%s", current_user);
if(lock = CreateDirTree(current_user_dir))
UnLock(lock);
current_user_options = ASPrintf("%s/Choices", current_user_dir);
if(ami_locate_resource(messages, "Messages") == false)