i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move ~/config/boot to ~/config/settings/

Browse Source
This commit is contained in:
Ingo Weinhold
2013-05-11 09:57:57 +02:00
parent 8a916d8752
commit a085e81e62
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/HaikuImage
+2 -2
View File
@@ -252,10 +252,10 @@ for linkTarget in $(SYSTEM_DEMOS) {
# scripts and data files # scripts and data files
local userBootScripts = UserBootscript UserSetupEnvironment.sample ; local userBootScripts = UserBootscript UserSetupEnvironment.sample ;
SEARCH on $(userBootScripts) = [ FDirName $(HAIKU_TOP) data config boot ] ; SEARCH on $(userBootScripts) = [ FDirName $(HAIKU_TOP) data config boot ] ;
AddFilesToHaikuImage home config boot : $(userBootScripts) ; AddFilesToHaikuImage home config settings boot : $(userBootScripts) ;
# Add boot launch directory # Add boot launch directory
AddDirectoryToHaikuImage home config boot launch ; AddDirectoryToHaikuImage home config settings boot launch ;
# Add mail provider infos. # Add mail provider infos.
AddFilesToHaikuImage home config settings Mail ProviderInfo : AddFilesToHaikuImage home config settings Mail ProviderInfo :
data/config/boot/UserBootscript
+1 -1
View File
@@ -3,7 +3,7 @@
# DO NOT EDIT! # DO NOT EDIT!
#===================================================================== #=====================================================================
# Start programs and open files in the boot launch folder # Start programs and open files in the boot launch folder
for file in $HOME/config/boot/launch/* for file in $HOME/config/settings/boot/launch/*
do do
/bin/open "$file" & /bin/open "$file" &
done done
data/system/boot/Bootscript
+2 -2
View File
@@ -186,8 +186,8 @@ launch system/preferences/Time "" --update
if [ "$SAFEMODE" != "yes" ]; then if [ "$SAFEMODE" != "yes" ]; then
# Start user boot script # Start user boot script
if [ -f $HOME/config/boot/UserBootscript ]; then if [ -f $HOME/config/settings/boot/UserBootscript ]; then
. $HOME/config/boot/UserBootscript . $HOME/config/settings/boot/UserBootscript
fi fi
fi fi
data/system/boot/SetupEnvironment
+2 -2
View File
@@ -54,8 +54,8 @@ fi
if [ "$SAFEMODE" != "yes" ] if [ "$SAFEMODE" != "yes" ]
then then
if [ -f $HOME/config/boot/UserSetupEnvironment ] if [ -f $HOME/config/settings/boot/UserSetupEnvironment ]
then then
. $HOME/config/boot/UserSetupEnvironment . $HOME/config/settings/boot/UserSetupEnvironment
fi fi
fi fi