Moved per user post install actions to first-login script.

* The same mechanism (and the same PostInstallScript) is used for this.
* If a file first_login exists in ~/config/settings/boot, the first-login
  scripts are launched, and the file removed.
* This fixes adding the deskbar tray icons even when there is no Deskbar
  running yet (for example on first boot when the FirstBootPrompt
  starts), or, IOW bug #12275.
This commit is contained in:
Axel Dörfler
2015-10-19 21:27:02 +02:00
parent d9bb9513c5
commit d2eca26b73
8 changed files with 31 additions and 17 deletions
+1 -1
View File
@@ -80,7 +80,7 @@ job x-vnd.Haiku-cddb_lookup {
}
job post-install {
launch /bin/sh /system/boot/PostInstallScript
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
}
+5
View File
@@ -20,6 +20,11 @@ target desktop {
launch /bin/sh ~/config/settings/boot/UserBootscript
}
job first-login {
launch /bin/sh /system/boot/PostInstallScript "first login" ~/config/settings/first_login /boot/system/boot/first-login
if file_exists ~/config/settings/first_login
}
job create-installer-link {
# When run from a read-only medium a.k.a. live desktop
if {
+1
View File
@@ -0,0 +1 @@
1
+6 -7
View File
@@ -2,17 +2,16 @@
# Check for fresh install and run post install scripts.
freshInstallIndicator=/boot/system/settings/fresh_install
postInstallDir=boot/post-install
if [ -e $freshInstallIndicator ]; then
# wait a moment for things to calm down a bit
sleep 3
title=$1
freshInstallIndicator=$2
postInstallDir=$3
if [ -e $freshInstallIndicator ]; then
# execute scripts
for f in /boot/system/$postInstallDir/*.sh
for f in $postInstallDir/*.sh
do
if [ -f $f ]; then
echo "Running post install script $f ..." > /dev/dprintf
echo "Running $title script $f ..." > /dev/dprintf
$f
fi
done