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

Move post install files to system package

This commit is contained in:
Ingo Weinhold 2011-06-30 18:36:06 +02:00
parent df18eb8718
commit 64b8c37680
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
build/jam/HaikuImage
View File

@ -307,16 +307,9 @@ SEARCH on $(networkSettingsFiles)
= [ FDirName $(HAIKU_TOP) data settings network ] ; = [ FDirName $(HAIKU_TOP) data settings network ] ;
AddFilesToHaikuImage common settings network : $(networkSettingsFiles) ; AddFilesToHaikuImage common settings network : $(networkSettingsFiles) ;
# post install scripts and fresh install indicator file # fresh install indicator file for the post install scripts
local postInstallFiles = add_catalog_entry_attributes.sh
default_deskbar_items.sh mime_update.sh ;
postInstallFiles = $(postInstallFiles:G=post-install) ;
SEARCH on $(postInstallFiles)
= [ FDirName $(HAIKU_TOP) data common boot post_install ] ;
SEARCH on <post-install>fresh_install SEARCH on <post-install>fresh_install
= [ FDirName $(HAIKU_TOP) data common settings ] ; = [ FDirName $(HAIKU_TOP) data common settings ] ;
AddFilesToHaikuImage common boot post_install
: $(postInstallFiles) ;
AddFilesToHaikuImage common settings : <post-install>fresh_install ; AddFilesToHaikuImage common settings : <post-install>fresh_install ;
# boot loader # boot loader

8
build/jam/HaikuPackages
View File

@ -154,6 +154,14 @@ local bootScripts = Bootscript Bootscript.cd SetupEnvironment Netscript
SEARCH on $(bootScripts) = [ FDirName $(HAIKU_TOP) data system boot ] ; SEARCH on $(bootScripts) = [ FDirName $(HAIKU_TOP) data system boot ] ;
AddFilesToPackage boot : $(bootScripts) ; AddFilesToPackage boot : $(bootScripts) ;
# post install scripts
local postInstallFiles = add_catalog_entry_attributes.sh
default_deskbar_items.sh mime_update.sh ;
postInstallFiles = $(postInstallFiles:G=post-install) ;
SEARCH on $(postInstallFiles)
= [ FDirName $(HAIKU_TOP) data common boot post_install ] ;
AddFilesToPackage boot post_install : $(postInstallFiles) ;
# artwork and sounds # artwork and sounds
local logoArtwork = local logoArtwork =
$(HAIKU_INCLUDE_TRADEMARKS)"HAIKU logo - white on blue - big.png" $(HAIKU_INCLUDE_TRADEMARKS)"HAIKU logo - white on blue - big.png"

5
data/system/boot/Bootscript
View File

@ -178,14 +178,15 @@ if [ "$SAFEMODE" != "yes" ]; then
fi fi
# Check for fresh install and run post install scripts. # Check for fresh install and run post install scripts.
postInstallDir=/boot/common/boot/post_install postInstallDir=boot/post_install
freshInstallIndicator=/boot/common/settings/fresh_install freshInstallIndicator=/boot/common/settings/fresh_install
if [ -e $freshInstallIndicator ]; then if [ -e $freshInstallIndicator ]; then
# wait a moment for things to calm down a bit # wait a moment for things to calm down a bit
sleep 3 sleep 3
# execute scripts # execute scripts
for f in $postInstallDir/*.sh; do for f in /boot/system/$postInstallDir/*.sh /boot/common/$postInstallDir/*.sh
do
if [ -f $f ]; then if [ -f $f ]; then
echo "Running post install script $f ..." > /dev/dprintf echo "Running post install script $f ..." > /dev/dprintf
$f $f