Chameleon Applications Commit Details - 225 - Chameleon related Applications (system preferences panels, helper applications)

Date:

2010-11-17 13:26:07 (13 years 7 months ago)

Author:

blackosx

Commit:

225

Parents:

224

Message:

Use ditto to merge temporary Extra folder with an existing Extra folder

Changes:

M	/branches/blackosx/trunk/PackageBuilder/Main_Package_Elements/Scripts/postflight.sh

File differences

-19
20 20
21 21
22 
22
23
24
23 25
24 26
25 27
26 28
27 
28 
29
30
29 31
30 32
31 
32 
33
34
33 35
34 36
35 37
... ...
38 40
39 41
40 42
41 
42 
43
44
43 45
44 46
45 47
+␊
␊
# Has the temporary directory /.Chameleon/Extra been created?␊
# If yes then transfer temporary com.apple.Boot.plist to destination.␊
# If yes then transfer temporary Extra folder to destination, ␊
# or merge temporary Extra folder in to an already existing Extra␊
# folder on the destination target.␊
 ␊
if [ -d ${3}/.Chameleon/Extra ]; then␊
␊
␉# check to see if install to EFI system partition was selected␊
␉# if chosen, the package installer will add a file named 'nullESP'␊
␉# in to the temporary directory /.Chameleon␊
␉# if chosen, the package installer would have added a file named␊
␉# 'nullESP' in to the temporary directory /.Chameleon␊
␊
␉if [ -f ${3}/.Chameleon/nullESP ]; then␊
␉␉echo "Executing command: mv -f ${3}/.Chameleon/Extra /Volumes/EFI"␊
␉␉mv -f ${3}/.Chameleon/Extra /Volumes/EFI␊
␉␉echo "Executing command: ditto ${3}/.Chameleon/Extra /Volumes/EFI/Extra"␊
␉␉ditto ${3}/.Chameleon/Extra /Volumes/EFI/Extra␊
␊
␉␉echo "Executing command: umount -f Volumes/EFI"␊
␉␉"$scriptDir"UnMountEFIvolumes.sh␊

␉␉␉rm -R -f /Volumes/EFI␊
␉␉fi␊
␉else␊
␉␉echo "Executing command: mv -f ${3}/.Chameleon/Extra ${3}/"␊
␉␉mv -f ${3}/.Chameleon/Extra ${3}/␊
␉␉echo "Executing command: ditto ${3}/.Chameleon/Extra ${3}/Extra"␊
␉␉ditto ${3}/.Chameleon/Extra ${3}/Extra␊
␉fi␊
␊
fi␊
 ...
 ␊
 ␊
 # Has the temporary directory /.Chameleon/Extra been created?␊
-# If yes then transfer temporary com.apple.Boot.plist to destination.␊
+# If yes then transfer temporary Extra folder to destination, ␊
+# or merge temporary Extra folder in to an already existing Extra␊
+# folder on the destination target.␊
  ␊
 if [ -d ${3}/.Chameleon/Extra ]; then␊
 ␊
 ␉# check to see if install to EFI system partition was selected␊
-␉# if chosen, the package installer will add a file named 'nullESP'␊
-␉# in to the temporary directory /.Chameleon␊
+␉# if chosen, the package installer would have added a file named␊
+␉# 'nullESP' in to the temporary directory /.Chameleon␊
 ␊
 ␉if [ -f ${3}/.Chameleon/nullESP ]; then␊
-␉␉echo "Executing command: mv -f ${3}/.Chameleon/Extra /Volumes/EFI"␊
-␉␉mv -f ${3}/.Chameleon/Extra /Volumes/EFI␊
+␉␉echo "Executing command: ditto ${3}/.Chameleon/Extra /Volumes/EFI/Extra"␊
+␉␉ditto ${3}/.Chameleon/Extra /Volumes/EFI/Extra␊
 ␊
 ␉␉echo "Executing command: umount -f Volumes/EFI"␊
 ␉␉"$scriptDir"UnMountEFIvolumes.sh␊
 ␉␉␉rm -R -f /Volumes/EFI␊
 ␉␉fi␊
 ␉else␊
-␉␉echo "Executing command: mv -f ${3}/.Chameleon/Extra ${3}/"␊
-␉␉mv -f ${3}/.Chameleon/Extra ${3}/␊
+␉␉echo "Executing command: ditto ${3}/.Chameleon/Extra ${3}/Extra"␊
+␉␉ditto ${3}/.Chameleon/Extra ${3}/Extra␊
 ␉fi␊
 ␊
 fi␊

Download the corresponding diff file