[haiku-commits] Change in haiku[master]: PackageKit: Remove hard coded first boot package processing scripts.

  • From: Gerrit <review@xxxxxxxxxxxxxxxxxxx>
  • To: waddlesplash <waddlesplash@xxxxxxxxx>, haiku-commits@xxxxxxxxxxxxx
  • Date: Wed, 24 Feb 2021 16:34:20 +0000

From Alexander G. M. Smith <agmsmith@xxxxxx>:

Alexander G. M. Smith has uploaded this change for review. ( 
https://review.haiku-os.org/c/haiku/+/3751 ;)


Change subject: PackageKit: Remove hard coded first boot package processing 
scripts.
......................................................................

PackageKit: Remove hard coded first boot package processing scripts.

Once change #2342 is in place (running first boot scripts exported from
packages), see Gerrit I3807b78042fdb70e5a79eca2e2a45816ece0236f,
remove data/system/boot/post_install/add_catalog_entry_attributes.sh
and related support infrastructure (magic files, launch_roster entries).
---
M build/jam/images/definitions/minimum
M build/jam/packages/Haiku
M data/launch/system
D data/system/boot/post_install/add_catalog_entry_attributes.sh
D data/system/settings/fresh_install
5 files changed, 1 insertion(+), 101 deletions(-)



  git pull ssh://git.haiku-os.org:22/haiku refs/changes/51/3751/1

diff --git a/build/jam/images/definitions/minimum 
b/build/jam/images/definitions/minimum
index 9fcfd12..4852de4 100644
--- a/build/jam/images/definitions/minimum
+++ b/build/jam/images/definitions/minimum
@@ -277,11 +277,6 @@
        = [ FDirName $(HAIKU_TOP) data settings network ] ;
 AddFilesToHaikuImage system settings network : $(networkSettingsFiles) ;

-# fresh install indicator file for the post install scripts
-SEARCH on <post-install>fresh_install
-       = [ FDirName $(HAIKU_TOP) data system settings ] ;
-AddFilesToHaikuImage system settings : <post-install>fresh_install ;
-
 # repository config and cache files
 local repository ;
 for repository in $(HAIKU_REPOSITORIES) {
diff --git a/build/jam/packages/Haiku b/build/jam/packages/Haiku
index d8e5b73..048fc41 100644
--- a/build/jam/packages/Haiku
+++ b/build/jam/packages/Haiku
@@ -135,13 +135,7 @@
 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)
diff --git a/data/launch/system b/data/launch/system
index b519e40..fed17e7 100644
--- a/data/launch/system
+++ b/data/launch/system
@@ -73,11 +73,6 @@
        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 e3320fb..0000000
--- 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 c2d6a0c..0000000
--- a/data/system/settings/fresh_install
+++ /dev/null
@@ -1 +0,0 @@
-This file is only supposed to exist on fresh Haiku installations.

--
To view, visit https://review.haiku-os.org/c/haiku/+/3751
To unsubscribe, or for help writing mail filters, visit 
https://review.haiku-os.org/settings

Gerrit-Project: haiku
Gerrit-Branch: master
Gerrit-Change-Id: I485e1a0a87c3e6a6ba3f882e65996f2327134d37
Gerrit-Change-Number: 3751
Gerrit-PatchSet: 1
Gerrit-Owner: Alexander G. M. Smith <agmsmith@xxxxxx>
Gerrit-MessageType: newchange

Other related posts:

  • » [haiku-commits] Change in haiku[master]: PackageKit: Remove hard coded first boot package processing scripts. - Gerrit