[haiku-commits] BRANCH HaikuPM-github.package-management [e63bdfe] build/jam build/jam/packages data/system/boot

  • From: HaikuPM-github.package-management <community@xxxxxxxxxxxx>
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Wed, 29 May 2013 02:30:32 +0200 (CEST)

added 1 changeset to branch 'refs/remotes/HaikuPM-github/package-management'
old head: b361d03f9384368625fd22108f2496807912b364
new head: e63bdfec7505fe241e7845a487c6ba029d44fc81
overview: https://github.com/haiku/HaikuPM/compare/b361d03...e63bdfe

----------------------------------------------------------------------------

e63bdfe: Rename post_install dir to post-install

                                    [ Ingo Weinhold <ingo_weinhold@xxxxxx> ]

----------------------------------------------------------------------------

Commit:      e63bdfec7505fe241e7845a487c6ba029d44fc81
Author:      Ingo Weinhold <ingo_weinhold@xxxxxx>
Date:        Wed May 29 00:24:54 2013 UTC

----------------------------------------------------------------------------

3 files changed, 3 insertions(+), 3 deletions(-)
build/jam/Haiku64Image      | 2 +-
build/jam/packages/Haiku    | 2 +-
data/system/boot/Bootscript | 2 +-

----------------------------------------------------------------------------

diff --git a/build/jam/Haiku64Image b/build/jam/Haiku64Image
index 9b6795b..4d4ec6b 100644
--- a/build/jam/Haiku64Image
+++ b/build/jam/Haiku64Image
@@ -373,7 +373,7 @@ SEARCH on $(postInstallFiles)
        = [ FDirName $(HAIKU_TOP) data common boot post_install ] ;
 SEARCH on <post-install>fresh_install
        = [ FDirName $(HAIKU_TOP) data common settings ] ;
-AddFilesToHaikuImage common boot post_install : $(postInstallFiles) ;
+AddFilesToHaikuImage common boot post-install : $(postInstallFiles) ;
 AddFilesToHaikuImage common settings : <post-install>fresh_install ;
 
 # boot loader
diff --git a/build/jam/packages/Haiku b/build/jam/packages/Haiku
index 435363f..08f57a5 100644
--- a/build/jam/packages/Haiku
+++ b/build/jam/packages/Haiku
@@ -179,7 +179,7 @@ local postInstallFiles = add_catalog_entry_attributes.sh
 postInstallFiles = $(postInstallFiles:G=post-install) ;
 SEARCH on $(postInstallFiles)
        = [ FDirName $(HAIKU_TOP) data common boot post_install ] ;
-AddFilesToPackage boot post_install : $(postInstallFiles) ;
+AddFilesToPackage boot post-install : $(postInstallFiles) ;
 
 # Gutenprint data files
 CopyDirectoryToPackage data
diff --git a/data/system/boot/Bootscript b/data/system/boot/Bootscript
index e37d49d..9fd1b18 100644
--- a/data/system/boot/Bootscript
+++ b/data/system/boot/Bootscript
@@ -193,7 +193,7 @@ fi
 
 # Check for fresh install and run post install scripts.
 freshInstallIndicator=/boot/common/settings/fresh_install
-postInstallDir=boot/post_install
+postInstallDir=boot/post-install
 if [ -e $freshInstallIndicator ]; then
        # wait a moment for things to calm down a bit
        sleep 3


Other related posts:

  • » [haiku-commits] BRANCH HaikuPM-github.package-management [e63bdfe] build/jam build/jam/packages data/system/boot - HaikuPM-github . package-management