diff --git a/build/jam/images/definitions/common-tail b/build/jam/images/definitions/common-tail index 37eb605ab0..490ba6ce3f 100644 --- a/build/jam/images/definitions/common-tail +++ b/build/jam/images/definitions/common-tail @@ -3,7 +3,7 @@ # create directories that may remain empty AddDirectoryToHaikuImage home : home.rdef ; -AddDirectoryToHaikuImage home Desktop ; +AddDirectoryToHaikuImage home Desktop : home-desktop.rdef ; AddDirectoryToHaikuImage home mail ; AddDirectoryToHaikuImage home config : home-config.rdef ; AddDirectoryToHaikuImage home config cache ; @@ -42,6 +42,7 @@ AddDirectoryToHaikuImage system non-packaged add-ons Screen\ Savers ; AddDirectoryToHaikuImage system non-packaged add-ons Translators ; AddDirectoryToHaikuImage system var empty ; AddDirectoryToHaikuImage system var log ; +AddDirectoryToHaikuImage trash : trash.rdef ; #pragma mark - Optional Packages diff --git a/build/jam/images/definitions/minimum b/build/jam/images/definitions/minimum index 9fcfd12aac..4852de4fbe 100644 --- a/build/jam/images/definitions/minimum +++ b/build/jam/images/definitions/minimum @@ -277,11 +277,6 @@ SEARCH on $(networkSettingsFiles) = [ FDirName $(HAIKU_TOP) data settings network ] ; AddFilesToHaikuImage system settings network : $(networkSettingsFiles) ; -# fresh install indicator file for the post install scripts -SEARCH on fresh_install - = [ FDirName $(HAIKU_TOP) data system settings ] ; -AddFilesToHaikuImage system settings : fresh_install ; - # repository config and cache files local repository ; for repository in $(HAIKU_REPOSITORIES) { diff --git a/build/jam/images/definitions/regular b/build/jam/images/definitions/regular index 20e47d0948..c82beb79ca 100644 --- a/build/jam/images/definitions/regular +++ b/build/jam/images/definitions/regular @@ -250,9 +250,13 @@ SYSTEM_ADD_ONS_FILE_SYSTEMS += ; # Mailbox folders and symlink -AddDirectoryToHaikuImage home mail draft ; -AddDirectoryToHaikuImage home mail in ; -AddDirectoryToHaikuImage home mail out ; +AddDirectoryToHaikuImage home mail : home-mail.rdef ; +AddDirectoryToHaikuImage home mail draft : home-mail-draft.rdef ; +AddDirectoryToHaikuImage home mail in : home-mail-in.rdef ; +AddDirectoryToHaikuImage home mail out : home-mail-out.rdef ; +AddDirectoryToHaikuImage home mail queries : home-mail-queries.rdef ; +AddDirectoryToHaikuImage home mail sent : home-mail-sent.rdef ; +AddDirectoryToHaikuImage home mail spam : home-mail-spam.rdef ; # Add boot launch directory AddDirectoryToHaikuImage home config settings boot launch ; @@ -262,6 +266,8 @@ AddFilesToHaikuImage home config settings Mail ProviderInfo : $(HAIKU_PROVIDER_INFOS) ; # Add Tracker New Templates +AddDirectoryToHaikuImage home config settings Tracker "Tracker New Templates" + : tracker-new-templates.rdef ; AddFilesToHaikuImage home config settings Tracker "Tracker New Templates" : "C++ header" @@ -278,4 +284,4 @@ AddDirectoryToHaikuImage home config settings printers "Save as PDF" : home-config-settings-printers-save-as-pdf.rdef ; # padblocker -AddDirectoryToHaikuImage home config settings touchpad ; \ No newline at end of file +AddDirectoryToHaikuImage home config settings touchpad ; diff --git a/build/jam/packages/Haiku b/build/jam/packages/Haiku index d8e5b7352d..9c33980677 100644 --- a/build/jam/packages/Haiku +++ b/build/jam/packages/Haiku @@ -135,13 +135,7 @@ local userLaunchScripts = user ; SEARCH on $(userLaunchScripts) = [ FDirName $(HAIKU_TOP) data launch ] ; AddFilesToPackage data user_launch : $(userLaunchScripts) ; -# post install + first login scripts -local postInstallFiles = add_catalog_entry_attributes.sh ; -postInstallFiles = $(postInstallFiles:G=post-install) ; -SEARCH on $(postInstallFiles) - = [ FDirName $(HAIKU_TOP) data system boot post_install ] ; -AddFilesToPackage boot post-install : $(postInstallFiles) ; - +# first login scripts local firstLoginFiles = default_deskbar_items.sh ; firstLoginFiles = $(firstLoginFiles:G=first-login) ; SEARCH on $(firstLoginFiles) @@ -275,21 +269,27 @@ AddDirectoryToPackage preferences : system-preferences.rdef ; # Deskbar menu symlinks -# "Applications" links local linkTarget ; + +# "Applications" links +AddDirectoryToPackage data deskbar menu Applications + : deskbar-applications.rdef ; for linkTarget in $(DESKBAR_APPLICATIONS) { AddSymlinkToPackage data deskbar menu Applications : ../../../../apps/$(linkTarget) : $(linkTarget) ; } # "Desktop applets" links +AddDirectoryToPackage data deskbar menu Desktop\ applets + : deskbar-applets.rdef ; for linkTarget in $(DESKBAR_DESKTOP_APPLETS) { AddSymlinkToPackage data deskbar menu Desktop\ applets : ../../../../apps/$(linkTarget) : $(linkTarget) ; } # "Preferences" links -AddDirectoryToPackage data deskbar menu Preferences ; +AddDirectoryToPackage data deskbar menu Preferences + : deskbar-preferences.rdef ; DESKBAR_PREFERENCES = $(SYSTEM_PREFERENCES:B) ; for linkTarget in $(DESKBAR_PREFERENCES) { AddSymlinkToPackage data deskbar menu Preferences @@ -298,7 +298,8 @@ for linkTarget in $(DESKBAR_PREFERENCES) { } # "Demo" links -AddDirectoryToPackage data deskbar menu Demos ; +AddDirectoryToPackage data deskbar menu Demos + : deskbar-demos.rdef ; for linkTarget in $(SYSTEM_DEMOS) { AddSymlinkToPackage data deskbar menu Demos : ../../../../demos/$(linkTarget) : $(linkTarget) ; diff --git a/data/launch/system b/data/launch/system index b519e40b35..fed17e77d3 100644 --- a/data/launch/system +++ b/data/launch/system @@ -73,11 +73,6 @@ job x-vnd.Haiku-cddb_lookup { on volume_mounted } -job post-install { - launch /bin/sh /system/boot/PostInstallScript "post install" /boot/system/settings/fresh_install /boot/system/boot/post-install - if file_exists /boot/system/settings/fresh_install -} - target login { job x-vnd.Haiku-autologin { launch /system/bin/autologin diff --git a/data/system/boot/post_install/add_catalog_entry_attributes.sh b/data/system/boot/post_install/add_catalog_entry_attributes.sh deleted file mode 100755 index e3320fb215..0000000000 --- a/data/system/boot/post_install/add_catalog_entry_attributes.sh +++ /dev/null @@ -1,83 +0,0 @@ -#!/bin/sh - -WriteCatalogEntryAttribute() -{ - # $1 : signature - # $2 : path - # $3 : context - - if ! [ -e "$2" ] - then - mkdir --parents "$2" - fi - - addattr -t string SYS:NAME "$1:$3:$(basename "$2")" "$2" -} - - -WriteTrackerCatalogEntryAttribute() -{ - WriteCatalogEntryAttribute "x-vnd.Haiku-libtracker" "$1" "$2" -} - - -WriteDeskbarCatalogEntryAttribute() -{ - WriteCatalogEntryAttribute "x-vnd.Be-TSKB" "$1" "$2" -} - - -WriteMailCatalogEntryAttribute() -{ - WriteCatalogEntryAttribute "x-vnd.Be-MAIL" "$1" "$2" -} - - -# TODO: Several of the directories are read-only, so this doesn't work. -WriteTrackerCatalogEntryAttribute \ - "$(finddir B_DESKTOP_DIRECTORY)" B_DESKTOP_DIRECTORY - -WriteTrackerCatalogEntryAttribute \ - "$(finddir B_USER_SETTINGS_DIRECTORY)/Tracker/Tracker New Templates" \ - "B_USER_SETTINGS_DIRECTORY/Tracker/Tracker New Templates" - -WriteTrackerCatalogEntryAttribute \ - "$(finddir B_TRASH_DIRECTORY)" B_TRASH_DIRECTORY - - - -WriteDeskbarCatalogEntryAttribute \ - "$(finddir B_USER_DESKBAR_DIRECTORY)/Applications" "B_USER_DESKBAR_DIRECTORY/Applications" - -WriteDeskbarCatalogEntryAttribute \ - "$(finddir B_USER_DESKBAR_DIRECTORY)/Demos" "B_USER_DESKBAR_DIRECTORY/Demos" - -WriteDeskbarCatalogEntryAttribute \ - "$(finddir B_USER_DESKBAR_DIRECTORY)/Desktop applets" "B_USER_DESKBAR_DIRECTORY/Desktop applets" - -WriteDeskbarCatalogEntryAttribute \ - "$(finddir B_USER_DESKBAR_DIRECTORY)/Preferences" "B_USER_DESKBAR_DIRECTORY/Preferences" - - - -WriteMailCatalogEntryAttribute \ - "$(finddir B_USER_DIRECTORY)/mail" "B_USER_DIRECTORY/mail" - -WriteMailCatalogEntryAttribute \ - "$(finddir B_USER_DIRECTORY)/mail/draft" "B_USER_DIRECTORY/mail/draft" - -WriteMailCatalogEntryAttribute \ - "$(finddir B_USER_DIRECTORY)/mail/in" "B_USER_DIRECTORY/mail/in" - -WriteMailCatalogEntryAttribute \ - "$(finddir B_USER_DIRECTORY)/mail/out" "B_USER_DIRECTORY/mail/out" - -WriteMailCatalogEntryAttribute \ - "$(finddir B_USER_DIRECTORY)/mail/queries" "B_USER_DIRECTORY/mail/queries" - -WriteMailCatalogEntryAttribute \ - "$(finddir B_USER_DIRECTORY)/mail/sent" "B_USER_DIRECTORY/mail/sent" - -WriteMailCatalogEntryAttribute \ - "$(finddir B_USER_DIRECTORY)/mail/spam" "B_USER_DIRECTORY/mail/spam" - diff --git a/data/system/settings/fresh_install b/data/system/settings/fresh_install deleted file mode 100644 index c2d6a0c50d..0000000000 --- a/data/system/settings/fresh_install +++ /dev/null @@ -1 +0,0 @@ -This file is only supposed to exist on fresh Haiku installations. diff --git a/src/data/directory_attrs/deskbar-applets.rdef b/src/data/directory_attrs/deskbar-applets.rdef new file mode 100644 index 0000000000..7ba43f8bb6 --- /dev/null +++ b/src/data/directory_attrs/deskbar-applets.rdef @@ -0,0 +1 @@ +resource(0, "SYS:NAME") "x-vnd.Be-TSKB:B_USER_DESKBAR_DIRECTORY/Desktop applets:Desktop applets"; diff --git a/src/data/directory_attrs/deskbar-applications.rdef b/src/data/directory_attrs/deskbar-applications.rdef new file mode 100644 index 0000000000..07754f7a94 --- /dev/null +++ b/src/data/directory_attrs/deskbar-applications.rdef @@ -0,0 +1 @@ +resource(0, "SYS:NAME") "x-vnd.Be-TSKB:B_USER_DESKBAR_DIRECTORY/Applications:Applications"; diff --git a/src/data/directory_attrs/deskbar-demos.rdef b/src/data/directory_attrs/deskbar-demos.rdef new file mode 100644 index 0000000000..a5c62a59c9 --- /dev/null +++ b/src/data/directory_attrs/deskbar-demos.rdef @@ -0,0 +1 @@ +resource(0, "SYS:NAME") "x-vnd.Be-TSKB:B_USER_DESKBAR_DIRECTORY/Demos:Demos"; diff --git a/src/data/directory_attrs/deskbar-preferences.rdef b/src/data/directory_attrs/deskbar-preferences.rdef new file mode 100644 index 0000000000..0de2cc1cf3 --- /dev/null +++ b/src/data/directory_attrs/deskbar-preferences.rdef @@ -0,0 +1 @@ +resource(0, "SYS:NAME") "x-vnd.Be-TSKB:B_USER_DESKBAR_DIRECTORY/Preferences:Preferences"; diff --git a/src/data/directory_attrs/home-desktop.rdef b/src/data/directory_attrs/home-desktop.rdef new file mode 100644 index 0000000000..661348f925 --- /dev/null +++ b/src/data/directory_attrs/home-desktop.rdef @@ -0,0 +1 @@ +resource(0, "SYS:NAME") "x-vnd.Haiku-libtracker:B_DESKTOP_DIRECTORY:home"; diff --git a/src/data/directory_attrs/home-mail-draft.rdef b/src/data/directory_attrs/home-mail-draft.rdef new file mode 100644 index 0000000000..79cf352bcf --- /dev/null +++ b/src/data/directory_attrs/home-mail-draft.rdef @@ -0,0 +1 @@ +resource(0, "SYS:NAME") "x-vnd.Be-MAIL:B_USER_DIRECTORY/mail/draft:draft"; diff --git a/src/data/directory_attrs/home-mail-in.rdef b/src/data/directory_attrs/home-mail-in.rdef new file mode 100644 index 0000000000..28088fbd86 --- /dev/null +++ b/src/data/directory_attrs/home-mail-in.rdef @@ -0,0 +1 @@ +resource(0, "SYS:NAME") "x-vnd.Be-MAIL:B_USER_DIRECTORY/mail/in:in"; diff --git a/src/data/directory_attrs/home-mail-out.rdef b/src/data/directory_attrs/home-mail-out.rdef new file mode 100644 index 0000000000..6d90d05a33 --- /dev/null +++ b/src/data/directory_attrs/home-mail-out.rdef @@ -0,0 +1 @@ +resource(0, "SYS:NAME") "x-vnd.Be-MAIL:B_USER_DIRECTORY/mail/out:out"; diff --git a/src/data/directory_attrs/home-mail-queries.rdef b/src/data/directory_attrs/home-mail-queries.rdef new file mode 100644 index 0000000000..a5945a12da --- /dev/null +++ b/src/data/directory_attrs/home-mail-queries.rdef @@ -0,0 +1 @@ +resource(0, "SYS:NAME") "x-vnd.Be-MAIL:B_USER_DIRECTORY/mail/queries:queries"; diff --git a/src/data/directory_attrs/home-mail-sent.rdef b/src/data/directory_attrs/home-mail-sent.rdef new file mode 100644 index 0000000000..e8a570f431 --- /dev/null +++ b/src/data/directory_attrs/home-mail-sent.rdef @@ -0,0 +1 @@ +resource(0, "SYS:NAME") "x-vnd.Be-MAIL:B_USER_DIRECTORY/mail/sent:sent"; diff --git a/src/data/directory_attrs/home-mail-spam.rdef b/src/data/directory_attrs/home-mail-spam.rdef new file mode 100644 index 0000000000..589b31ce4d --- /dev/null +++ b/src/data/directory_attrs/home-mail-spam.rdef @@ -0,0 +1 @@ +resource(0, "SYS:NAME") "x-vnd.Be-MAIL:B_USER_DIRECTORY/mail/spam:spam"; diff --git a/src/data/directory_attrs/home-mail.rdef b/src/data/directory_attrs/home-mail.rdef new file mode 100644 index 0000000000..b9101549eb --- /dev/null +++ b/src/data/directory_attrs/home-mail.rdef @@ -0,0 +1 @@ +resource(0, "SYS:NAME") "x-vnd.Be-MAIL:B_USER_DIRECTORY/mail:mail"; diff --git a/src/data/directory_attrs/tracker-new-templates.rdef b/src/data/directory_attrs/tracker-new-templates.rdef new file mode 100644 index 0000000000..b6ee5423d3 --- /dev/null +++ b/src/data/directory_attrs/tracker-new-templates.rdef @@ -0,0 +1,2 @@ +resource(0, "SYS:NAME") "x-vnd.Haiku-libtracker:B_USER_SETTINGS_DIRECTORY/Tracker/Tracker New Templates:Tracker New Templates"; + diff --git a/src/data/directory_attrs/trash.rdef b/src/data/directory_attrs/trash.rdef new file mode 100644 index 0000000000..d8ca63db95 --- /dev/null +++ b/src/data/directory_attrs/trash.rdef @@ -0,0 +1 @@ +resource(0, "SYS:NAME") "x-vnd.Haiku-libtracker:B_TRASH_DIRECTORY:Trash";