From bf814076067d5fb7a581aef009882b6fe1c13fb8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20A=C3=9Fmus?= Date: Tue, 8 Sep 2009 09:58:51 +0000 Subject: [PATCH] * Removed Installer back into Deskbar menu by popular request. * Changed the Bootscript and the InstallerFinishScript to only create and cleanup a link on the Desktop. * Applied patch by idefix to fix removing the Installer link from volumes that contain spaces in the name. (Thanks!) git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@32995 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- build/jam/HaikuImage | 4 ++-- data/system/boot/Bootscript | 3 +-- data/system/boot/InstallerFinishScript | 5 ++--- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/build/jam/HaikuImage b/build/jam/HaikuImage index 81d1839226..db9110b55b 100644 --- a/build/jam/HaikuImage +++ b/build/jam/HaikuImage @@ -283,8 +283,8 @@ AddSymlinkToHaikuImage home Desktop : /boot/home : Home ; # Deskbar Application links AddDirectoryToHaikuImage home config be Applications ; DESKBAR_APPLICATIONS = ActivityMonitor CharacterMap CodyCam CDPlayer DeskCalc - DiskProbe DriveSetup DiskUsage Expander Icon-O-Matic Magnify Mail - MediaConverter MediaPlayer MidiPlayer People PoorMan Screenshot + DiskProbe DriveSetup DiskUsage Expander Icon-O-Matic Installer Magnify + Mail MediaConverter MediaPlayer MidiPlayer People PoorMan Screenshot SoundRecorder StyledEdit Terminal TV ; local linkTarget ; diff --git a/data/system/boot/Bootscript b/data/system/boot/Bootscript index c4c923be3d..9da752291d 100644 --- a/data/system/boot/Bootscript +++ b/data/system/boot/Bootscript @@ -102,9 +102,8 @@ fi # Now ask the user if he wants to run the Installer or continue to the Desktop. if [ "$isReadOnly" = "yes" ]; then - # Create Installer links (using the write overlay) + # Create Installer link (using the write overlay) ln -sf /boot/system/apps/Installer /boot/home/Desktop/Installer - ln -sf /boot/system/apps/Installer /boot/home/config/be/Applications/Installer /bin/alert "Do you wish to run the Installer or continue booting to the Desktop?" "Installer" "Desktop" if [ $? -eq 0 ]; then diff --git a/data/system/boot/InstallerFinishScript b/data/system/boot/InstallerFinishScript index a105f98864..01202eb3ec 100644 --- a/data/system/boot/InstallerFinishScript +++ b/data/system/boot/InstallerFinishScript @@ -15,8 +15,7 @@ fi mkdir -p "$target/var/tmp" -# remove Installer links -rm -f $target/home/Desktop/Installer -rm -f $target/home/config/be/Applications/Installer +# remove Installer link +rm -f "$target/home/Desktop/Installer" makebootable "$target"