Index: branches/blackosx/package/Scripts/Advanced/ForceHPET/postinstall =================================================================== --- branches/blackosx/package/Scripts/Advanced/ForceHPET/postinstall (revision 1573) +++ branches/blackosx/package/Scripts/Advanced/ForceHPET/postinstall (revision 1574) @@ -6,11 +6,11 @@ import shutil vol = str(sys.argv[3]) -extrafolder = vol + "/tmpcham/Extra" +extrafolder = vol + "/usr/local/chamTemp/Extra" if not os.path.exists(extrafolder): os.makedirs(extrafolder) -boot = "/tmpcham/Extra/org.chameleon.Boot.plist" +boot = "/usr/local/chamTemp/Extra/org.chameleon.Boot.plist" plist = vol + boot if not os.path.exists(plist): Index: branches/blackosx/package/Scripts/Advanced/UseKernelCache/postinstall =================================================================== --- branches/blackosx/package/Scripts/Advanced/UseKernelCache/postinstall (revision 1573) +++ branches/blackosx/package/Scripts/Advanced/UseKernelCache/postinstall (revision 1574) @@ -6,11 +6,11 @@ import shutil vol = str(sys.argv[3]) -extrafolder = vol + "/tmpcham/Extra" +extrafolder = vol + "/usr/local/chamTemp/Extra" if not os.path.exists(extrafolder): os.makedirs(extrafolder) -boot = "/tmpcham/Extra/org.chameleon.Boot.plist" +boot = "/usr/local/chamTemp/Extra/org.chameleon.Boot.plist" plist = vol + boot if not os.path.exists(plist): Index: branches/blackosx/package/Scripts/Advanced/EHCIacquire/postinstall =================================================================== --- branches/blackosx/package/Scripts/Advanced/EHCIacquire/postinstall (revision 1573) +++ branches/blackosx/package/Scripts/Advanced/EHCIacquire/postinstall (revision 1574) @@ -6,11 +6,11 @@ import shutil vol = str(sys.argv[3]) -extrafolder = vol + "/tmpcham/Extra" +extrafolder = vol + "/usr/local/chamTemp/Extra" if not os.path.exists(extrafolder): os.makedirs(extrafolder) -boot = "/tmpcham/Extra/org.chameleon.Boot.plist" +boot = "/usr/local/chamTemp/Extra/org.chameleon.Boot.plist" plist = vol + boot if not os.path.exists(plist): Index: branches/blackosx/package/Scripts/Advanced/VBIOS/postinstall =================================================================== --- branches/blackosx/package/Scripts/Advanced/VBIOS/postinstall (revision 1573) +++ branches/blackosx/package/Scripts/Advanced/VBIOS/postinstall (revision 1574) @@ -6,11 +6,11 @@ import shutil vol = str(sys.argv[3]) -extrafolder = vol + "/tmpcham/Extra" +extrafolder = vol + "/usr/local/chamTemp/Extra" if not os.path.exists(extrafolder): os.makedirs(extrafolder) -boot = "/tmpcham/Extra/org.chameleon.Boot.plist" +boot = "/usr/local/chamTemp/Extra/org.chameleon.Boot.plist" plist = vol + boot if not os.path.exists(plist): Index: branches/blackosx/package/Scripts/Advanced/GUI/postinstall =================================================================== --- branches/blackosx/package/Scripts/Advanced/GUI/postinstall (revision 1573) +++ branches/blackosx/package/Scripts/Advanced/GUI/postinstall (revision 1574) @@ -6,11 +6,11 @@ import shutil vol = str(sys.argv[3]) -extrafolder = vol + "/tmpcham/Extra" +extrafolder = vol + "/usr/local/chamTemp/Extra" if not os.path.exists(extrafolder): os.makedirs(extrafolder) -boot = "/tmpcham/Extra/org.chameleon.Boot.plist" +boot = "/usr/local/chamTemp/Extra/org.chameleon.Boot.plist" plist = vol + boot if not os.path.exists(plist): Index: branches/blackosx/package/Scripts/Advanced/SMBIOSdefaults/postinstall =================================================================== --- branches/blackosx/package/Scripts/Advanced/SMBIOSdefaults/postinstall (revision 1573) +++ branches/blackosx/package/Scripts/Advanced/SMBIOSdefaults/postinstall (revision 1574) @@ -6,11 +6,11 @@ import shutil vol = str(sys.argv[3]) -extrafolder = vol + "/tmpcham/Extra" +extrafolder = vol + "/usr/local/chamTemp/Extra" if not os.path.exists(extrafolder): os.makedirs(extrafolder) -boot = "/tmpcham/Extra/org.chameleon.Boot.plist" +boot = "/usr/local/chamTemp/Extra/org.chameleon.Boot.plist" plist = vol + boot if not os.path.exists(plist): Index: branches/blackosx/package/Scripts/Advanced/UseMemDetect/postinstall =================================================================== --- branches/blackosx/package/Scripts/Advanced/UseMemDetect/postinstall (revision 1573) +++ branches/blackosx/package/Scripts/Advanced/UseMemDetect/postinstall (revision 1574) @@ -6,11 +6,11 @@ import shutil vol = str(sys.argv[3]) -extrafolder = vol + "/tmpcham/Extra" +extrafolder = vol + "/usr/local/chamTemp/Extra" if not os.path.exists(extrafolder): os.makedirs(extrafolder) -boot = "/tmpcham/Extra/org.chameleon.Boot.plist" +boot = "/usr/local/chamTemp/Extra/org.chameleon.Boot.plist" plist = vol + boot if not os.path.exists(plist): Index: branches/blackosx/package/Scripts/Advanced/LegacyLogo/postinstall =================================================================== --- branches/blackosx/package/Scripts/Advanced/LegacyLogo/postinstall (revision 1573) +++ branches/blackosx/package/Scripts/Advanced/LegacyLogo/postinstall (revision 1574) @@ -6,11 +6,11 @@ import shutil vol = str(sys.argv[3]) -extrafolder = vol + "/tmpcham/Extra" +extrafolder = vol + "/usr/local/chamTemp/Extra" if not os.path.exists(extrafolder): os.makedirs(extrafolder) -boot = "/tmpcham/Extra/org.chameleon.Boot.plist" +boot = "/usr/local/chamTemp/Extra/org.chameleon.Boot.plist" plist = vol + boot if not os.path.exists(plist): Index: branches/blackosx/package/Scripts/Advanced/Wake/postinstall =================================================================== --- branches/blackosx/package/Scripts/Advanced/Wake/postinstall (revision 1573) +++ branches/blackosx/package/Scripts/Advanced/Wake/postinstall (revision 1574) @@ -6,11 +6,11 @@ import shutil vol = str(sys.argv[3]) -extrafolder = vol + "/tmpcham/Extra" +extrafolder = vol + "/usr/local/chamTemp/Extra" if not os.path.exists(extrafolder): os.makedirs(extrafolder) -boot = "/tmpcham/Extra/org.chameleon.Boot.plist" +boot = "/usr/local/chamTemp/Extra/org.chameleon.Boot.plist" plist = vol + boot if not os.path.exists(plist): Index: branches/blackosx/package/Scripts/Advanced/BootBanner/postinstall =================================================================== --- branches/blackosx/package/Scripts/Advanced/BootBanner/postinstall (revision 1573) +++ branches/blackosx/package/Scripts/Advanced/BootBanner/postinstall (revision 1574) @@ -6,11 +6,11 @@ import shutil vol = str(sys.argv[3]) -extrafolder = vol + "/tmpcham/Extra" +extrafolder = vol + "/usr/local/chamTemp/Extra" if not os.path.exists(extrafolder): os.makedirs(extrafolder) -boot = "/tmpcham/Extra/org.chameleon.Boot.plist" +boot = "/usr/local/chamTemp/Extra/org.chameleon.Boot.plist" plist = vol + boot if not os.path.exists(plist): Index: branches/blackosx/package/Scripts/Advanced/Npci/postinstall =================================================================== --- branches/blackosx/package/Scripts/Advanced/Npci/postinstall (revision 1573) +++ branches/blackosx/package/Scripts/Advanced/Npci/postinstall (revision 1574) @@ -6,11 +6,11 @@ import shutil vol = str(sys.argv[3]) -extrafolder = vol + "/tmpcham/Extra" +extrafolder = vol + "/usr/local/chamTemp/Extra" if not os.path.exists(extrafolder): os.makedirs(extrafolder) -boot = "/tmpcham/Extra/org.chameleon.Boot.plist" +boot = "/usr/local/chamTemp/Extra/org.chameleon.Boot.plist" plist = vol + boot if not os.path.exists(plist): Index: branches/blackosx/package/Scripts/Advanced/UHCIreset/postinstall =================================================================== --- branches/blackosx/package/Scripts/Advanced/UHCIreset/postinstall (revision 1573) +++ branches/blackosx/package/Scripts/Advanced/UHCIreset/postinstall (revision 1574) @@ -6,11 +6,11 @@ import shutil vol = str(sys.argv[3]) -extrafolder = vol + "/tmpcham/Extra" +extrafolder = vol + "/usr/local/chamTemp/Extra" if not os.path.exists(extrafolder): os.makedirs(extrafolder) -boot = "/tmpcham/Extra/org.chameleon.Boot.plist" +boot = "/usr/local/chamTemp/Extra/org.chameleon.Boot.plist" plist = vol + boot if not os.path.exists(plist): Index: branches/blackosx/package/Scripts/Advanced/ShowInfo/postinstall =================================================================== --- branches/blackosx/package/Scripts/Advanced/ShowInfo/postinstall (revision 1573) +++ branches/blackosx/package/Scripts/Advanced/ShowInfo/postinstall (revision 1574) @@ -6,11 +6,11 @@ import shutil vol = str(sys.argv[3]) -extrafolder = vol + "/tmpcham/Extra" +extrafolder = vol + "/usr/local/chamTemp/Extra" if not os.path.exists(extrafolder): os.makedirs(extrafolder) -boot = "/tmpcham/Extra/org.chameleon.Boot.plist" +boot = "/usr/local/chamTemp/Extra/org.chameleon.Boot.plist" plist = vol + boot if not os.path.exists(plist): Index: branches/blackosx/package/Scripts/Advanced/Wait/postinstall =================================================================== --- branches/blackosx/package/Scripts/Advanced/Wait/postinstall (revision 1573) +++ branches/blackosx/package/Scripts/Advanced/Wait/postinstall (revision 1574) @@ -6,11 +6,11 @@ import shutil vol = str(sys.argv[3]) -extrafolder = vol + "/tmpcham/Extra" +extrafolder = vol + "/usr/local/chamTemp/Extra" if not os.path.exists(extrafolder): os.makedirs(extrafolder) -boot = "/tmpcham/Extra/org.chameleon.Boot.plist" +boot = "/usr/local/chamTemp/Extra/org.chameleon.Boot.plist" plist = vol + boot if not os.path.exists(plist): Index: branches/blackosx/package/Scripts/Advanced/UseNvidiaROM/postinstall =================================================================== --- branches/blackosx/package/Scripts/Advanced/UseNvidiaROM/postinstall (revision 1573) +++ branches/blackosx/package/Scripts/Advanced/UseNvidiaROM/postinstall (revision 1574) @@ -6,11 +6,11 @@ import shutil vol = str(sys.argv[3]) -extrafolder = vol + "/tmpcham/Extra" +extrafolder = vol + "/usr/local/chamTemp/Extra" if not os.path.exists(extrafolder): os.makedirs(extrafolder) -boot = "/tmpcham/Extra/org.chameleon.Boot.plist" +boot = "/usr/local/chamTemp/Extra/org.chameleon.Boot.plist" plist = vol + boot if not os.path.exists(plist): Index: branches/blackosx/package/Scripts/Advanced/ForceWake/postinstall =================================================================== --- branches/blackosx/package/Scripts/Advanced/ForceWake/postinstall (revision 1573) +++ branches/blackosx/package/Scripts/Advanced/ForceWake/postinstall (revision 1574) @@ -6,11 +6,11 @@ import shutil vol = str(sys.argv[3]) -extrafolder = vol + "/tmpcham/Extra" +extrafolder = vol + "/usr/local/chamTemp/Extra" if not os.path.exists(extrafolder): os.makedirs(extrafolder) -boot = "/tmpcham/Extra/org.chameleon.Boot.plist" +boot = "/usr/local/chamTemp/Extra/org.chameleon.Boot.plist" plist = vol + boot if not os.path.exists(plist): Index: branches/blackosx/package/Scripts/Advanced/UseAtiROM/postinstall =================================================================== --- branches/blackosx/package/Scripts/Advanced/UseAtiROM/postinstall (revision 1573) +++ branches/blackosx/package/Scripts/Advanced/UseAtiROM/postinstall (revision 1574) @@ -6,11 +6,11 @@ import shutil vol = str(sys.argv[3]) -extrafolder = vol + "/tmpcham/Extra" +extrafolder = vol + "/usr/local/chamTemp/Extra" if not os.path.exists(extrafolder): os.makedirs(extrafolder) -boot = "/tmpcham/Extra/org.chameleon.Boot.plist" +boot = "/usr/local/chamTemp/Extra/org.chameleon.Boot.plist" plist = vol + boot if not os.path.exists(plist): Index: branches/blackosx/package/Scripts/Advanced/QuietBoot/postinstall =================================================================== --- branches/blackosx/package/Scripts/Advanced/QuietBoot/postinstall (revision 1573) +++ branches/blackosx/package/Scripts/Advanced/QuietBoot/postinstall (revision 1574) @@ -6,11 +6,11 @@ import shutil vol = str(sys.argv[3]) -extrafolder = vol + "/tmpcham/Extra" +extrafolder = vol + "/usr/local/chamTemp/Extra" if not os.path.exists(extrafolder): os.makedirs(extrafolder) -boot = "/tmpcham/Extra/org.chameleon.Boot.plist" +boot = "/usr/local/chamTemp/Extra/org.chameleon.Boot.plist" plist = vol + boot if not os.path.exists(plist): Index: branches/blackosx/package/Scripts/Post/postinstall =================================================================== --- branches/blackosx/package/Scripts/Post/postinstall (revision 1573) +++ branches/blackosx/package/Scripts/Post/postinstall (revision 1574) @@ -33,20 +33,22 @@ dest_vol="$3" fi -# Extra folder now resides in /tmpcham. -# Copy /tmpcham/Extra to correct location. +chamTemp="usr/local/chamTemp" #blackosx added + +# Extra folder now resides in /$chamTemp. +# Copy /$chamTemp/Extra to correct location. if [ ! -f "$dest_vol"/.ChameleonEFI ]; then - echo "Copying $dest_vol/tmpcham/Extra/* $dest_vol/Extra" + echo "Copying $dest_vol/$chamTemp/Extra/* $dest_vol/Extra" if [ ! -f "$dest_vol"/Extra ]; then mkdir "$dest_vol"/Extra fi - cp -R "$dest_vol"/tmpcham/Extra/* "$dest_vol"/Extra + cp -R "$dest_vol"/$chamTemp/Extra/* "$dest_vol"/Extra else - echo "Copying $dest_vol/tmpcham/Extra/* $/Volumes/EFI/Extra" + echo "Copying $dest_vol/$chamTemp/Extra/* $/Volumes/EFI/Extra" if [ ! -f "/Volumes/EFI/Extra" ]; then mkdir "/Volumes/EFI/Extra" fi - cp -R "$dest_vol"/tmpcham/Extra/* /Volumes/EFI/Extra + cp -R "$dest_vol"/$chamTemp/Extra/* /Volumes/EFI/Extra # unmount /Volumes/EFI attempts=1 @@ -68,8 +70,8 @@ fi # delete the temporary Chameleon folder -echo "Removing $dest_vol/tmpcham file" -rm -rf "$dest_vol/tmpcham" +echo "Removing $dest_vol/$chamTemp file" +rm -rf "$dest_vol/$chamTemp" echo "Done..." \ No newline at end of file Index: branches/blackosx/package/Scripts/BaseOptions/GenerateCStates/postinstall =================================================================== --- branches/blackosx/package/Scripts/BaseOptions/GenerateCStates/postinstall (revision 1573) +++ branches/blackosx/package/Scripts/BaseOptions/GenerateCStates/postinstall (revision 1574) @@ -6,11 +6,11 @@ import shutil vol = str(sys.argv[3]) -extrafolder = vol + "/tmpcham/Extra" +extrafolder = vol + "/usr/local/chamTemp/Extra" if not os.path.exists(extrafolder): os.makedirs(extrafolder) -boot = "/tmpcham/Extra/org.chameleon.Boot.plist" +boot = "/usr/local/chamTemp/Extra/org.chameleon.Boot.plist" plist = vol + boot if not os.path.exists(plist): Index: branches/blackosx/package/Scripts/BaseOptions/DropSSDT/postinstall =================================================================== --- branches/blackosx/package/Scripts/BaseOptions/DropSSDT/postinstall (revision 1573) +++ branches/blackosx/package/Scripts/BaseOptions/DropSSDT/postinstall (revision 1574) @@ -6,11 +6,11 @@ import shutil vol = str(sys.argv[3]) -extrafolder = vol + "/tmpcham/Extra" +extrafolder = vol + "/usr/local/chamTemp/Extra" if not os.path.exists(extrafolder): os.makedirs(extrafolder) -boot = "/tmpcham/Extra/org.chameleon.Boot.plist" +boot = "/usr/local/chamTemp/Extra/org.chameleon.Boot.plist" plist = vol + boot if not os.path.exists(plist): Index: branches/blackosx/package/Scripts/BaseOptions/EthernetBuiltIn/postinstall =================================================================== --- branches/blackosx/package/Scripts/BaseOptions/EthernetBuiltIn/postinstall (revision 1573) +++ branches/blackosx/package/Scripts/BaseOptions/EthernetBuiltIn/postinstall (revision 1574) @@ -6,11 +6,11 @@ import shutil vol = str(sys.argv[3]) -extrafolder = vol + "/tmpcham/Extra" +extrafolder = vol + "/usr/local/chamTemp/Extra" if not os.path.exists(extrafolder): os.makedirs(extrafolder) -boot = "/tmpcham/Extra/org.chameleon.Boot.plist" +boot = "/usr/local/chamTemp/Extra/org.chameleon.Boot.plist" plist = vol + boot if not os.path.exists(plist): Index: branches/blackosx/package/Scripts/BaseOptions/InstantMenu/postinstall =================================================================== --- branches/blackosx/package/Scripts/BaseOptions/InstantMenu/postinstall (revision 1573) +++ branches/blackosx/package/Scripts/BaseOptions/InstantMenu/postinstall (revision 1574) @@ -7,11 +7,11 @@ import shutil vol = str(sys.argv[3]) -extrafolder = vol + "/tmpcham/Extra" +extrafolder = vol + "/usr/local/chamTemp/Extra" if not os.path.exists(extrafolder): os.makedirs(extrafolder) -boot = "/tmpcham/Extra/org.chameleon.Boot.plist" +boot = "/usr/local/chamTemp/Extra/org.chameleon.Boot.plist" plist = vol + boot if not os.path.exists(plist): Index: branches/blackosx/package/Scripts/BaseOptions/GraphicsEnabler/postinstall =================================================================== --- branches/blackosx/package/Scripts/BaseOptions/GraphicsEnabler/postinstall (revision 1573) +++ branches/blackosx/package/Scripts/BaseOptions/GraphicsEnabler/postinstall (revision 1574) @@ -6,11 +6,11 @@ import shutil vol = str(sys.argv[3]) -extrafolder = vol + "/tmpcham/Extra" +extrafolder = vol + "/usr/local/chamTemp/Extra" if not os.path.exists(extrafolder): os.makedirs(extrafolder) -boot = "/tmpcham/Extra/org.chameleon.Boot.plist" +boot = "/usr/local/chamTemp/Extra/org.chameleon.Boot.plist" plist = vol + boot if not os.path.exists(plist): Index: branches/blackosx/package/Scripts/BaseOptions/RestartFix/postinstall =================================================================== --- branches/blackosx/package/Scripts/BaseOptions/RestartFix/postinstall (revision 1573) +++ branches/blackosx/package/Scripts/BaseOptions/RestartFix/postinstall (revision 1574) @@ -6,11 +6,11 @@ import shutil vol = str(sys.argv[3]) -extrafolder = vol + "/tmpcham/Extra" +extrafolder = vol + "/usr/local/chamTemp/Extra" if not os.path.exists(extrafolder): os.makedirs(extrafolder) -boot = "/tmpcham/Extra/org.chameleon.Boot.plist" +boot = "/usr/local/chamTemp/Extra/org.chameleon.Boot.plist" plist = vol + boot if not os.path.exists(plist): Index: branches/blackosx/package/Scripts/BaseOptions/CSTUsingSystemIO/postinstall =================================================================== --- branches/blackosx/package/Scripts/BaseOptions/CSTUsingSystemIO/postinstall (revision 1573) +++ branches/blackosx/package/Scripts/BaseOptions/CSTUsingSystemIO/postinstall (revision 1574) @@ -6,11 +6,11 @@ import shutil vol = str(sys.argv[3]) -extrafolder = vol + "/tmpcham/Extra" +extrafolder = vol + "/usr/local/chamTemp/Extra" if not os.path.exists(extrafolder): os.makedirs(extrafolder) -boot = "/tmpcham/Extra/org.chameleon.Boot.plist" +boot = "/usr/local/chamTemp/Extra/org.chameleon.Boot.plist" plist = vol + boot if not os.path.exists(plist): Index: branches/blackosx/package/Scripts/BaseOptions/EnableC2State/postinstall =================================================================== --- branches/blackosx/package/Scripts/BaseOptions/EnableC2State/postinstall (revision 1573) +++ branches/blackosx/package/Scripts/BaseOptions/EnableC2State/postinstall (revision 1574) @@ -6,13 +6,12 @@ import shutil vol = str(sys.argv[3]) -extrafolder = vol + "/tmpcham/Extra" +extrafolder = vol + "/usr/local/chamTemp/Extra" if not os.path.exists(extrafolder): os.makedirs(extrafolder) -boot = "/tmpcham/Extra/org.chameleon.Boot.plist" +boot = "/usr/local/chamTemp/Extra/org.chameleon.Boot.plist" plist = vol + boot - if not os.path.exists(plist): shutil.copy('/Library/Preferences/SystemConfiguration/com.apple.Boot.plist', plist) Index: branches/blackosx/package/Scripts/BaseOptions/EnableC3State/postinstall =================================================================== --- branches/blackosx/package/Scripts/BaseOptions/EnableC3State/postinstall (revision 1573) +++ branches/blackosx/package/Scripts/BaseOptions/EnableC3State/postinstall (revision 1574) @@ -6,11 +6,11 @@ import shutil vol = str(sys.argv[3]) -extrafolder = vol + "/tmpcham/Extra" +extrafolder = vol + "/usr/local/chamTemp/Extra" if not os.path.exists(extrafolder): os.makedirs(extrafolder) -boot = "/tmpcham/Extra/org.chameleon.Boot.plist" +boot = "/usr/local/chamTemp/Extra/org.chameleon.Boot.plist" plist = vol + boot if not os.path.exists(plist): Index: branches/blackosx/package/Scripts/BaseOptions/arch/postinstall =================================================================== --- branches/blackosx/package/Scripts/BaseOptions/arch/postinstall (revision 1573) +++ branches/blackosx/package/Scripts/BaseOptions/arch/postinstall (revision 1574) @@ -6,11 +6,11 @@ import shutil vol = str(sys.argv[3]) -extrafolder = vol + "/tmpcham/Extra" +extrafolder = vol + "/usr/local/chamTemp/Extra" if not os.path.exists(extrafolder): os.makedirs(extrafolder) -boot = "/tmpcham/Extra/org.chameleon.Boot.plist" +boot = "/usr/local/chamTemp/Extra/org.chameleon.Boot.plist" plist = vol + boot if not os.path.exists(plist): Index: branches/blackosx/package/Scripts/BaseOptions/EnableC4State/postinstall =================================================================== --- branches/blackosx/package/Scripts/BaseOptions/EnableC4State/postinstall (revision 1573) +++ branches/blackosx/package/Scripts/BaseOptions/EnableC4State/postinstall (revision 1574) @@ -6,11 +6,11 @@ import shutil vol = str(sys.argv[3]) -extrafolder = vol + "/tmpcham/Extra" +extrafolder = vol + "/usr/local/chamTemp/Extra" if not os.path.exists(extrafolder): os.makedirs(extrafolder) -boot = "/tmpcham/Extra/org.chameleon.Boot.plist" +boot = "/usr/local/chamTemp/Extra/org.chameleon.Boot.plist" plist = vol + boot if not os.path.exists(plist): Index: branches/blackosx/package/Scripts/BaseOptions/GeneratePStates/postinstall =================================================================== --- branches/blackosx/package/Scripts/BaseOptions/GeneratePStates/postinstall (revision 1573) +++ branches/blackosx/package/Scripts/BaseOptions/GeneratePStates/postinstall (revision 1574) @@ -6,11 +6,11 @@ import shutil vol = str(sys.argv[3]) -extrafolder = vol + "/tmpcham/Extra" +extrafolder = vol + "/usr/local/chamTemp/Extra" if not os.path.exists(extrafolder): os.makedirs(extrafolder) -boot = "/tmpcham/Extra/org.chameleon.Boot.plist" +boot = "/usr/local/chamTemp/Extra/org.chameleon.Boot.plist" plist = vol + boot if not os.path.exists(plist): Index: branches/blackosx/package/Scripts/Resolutions/1024x768x32/postinstall =================================================================== --- branches/blackosx/package/Scripts/Resolutions/1024x768x32/postinstall (revision 1573) +++ branches/blackosx/package/Scripts/Resolutions/1024x768x32/postinstall (revision 1574) @@ -6,11 +6,11 @@ import shutil vol = str(sys.argv[3]) -extrafolder = vol + "/tmpcham/Extra" +extrafolder = vol + "/usr/local/chamTemp/Extra" if not os.path.exists(extrafolder): os.makedirs(extrafolder) -boot = "/tmpcham/Extra/org.chameleon.Boot.plist" +boot = "/usr/local/chamTemp/Extra/org.chameleon.Boot.plist" plist = vol + boot if not os.path.exists(plist): Index: branches/blackosx/package/Scripts/Resolutions/1024x600x32/postinstall =================================================================== --- branches/blackosx/package/Scripts/Resolutions/1024x600x32/postinstall (revision 1573) +++ branches/blackosx/package/Scripts/Resolutions/1024x600x32/postinstall (revision 1574) @@ -6,11 +6,11 @@ import shutil vol = str(sys.argv[3]) -extrafolder = vol + "/tmpcham/Extra" +extrafolder = vol + "/usr/local/chamTemp/Extra" if not os.path.exists(extrafolder): os.makedirs(extrafolder) -boot = "/tmpcham/Extra/org.chameleon.Boot.plist" +boot = "/usr/local/chamTemp/Extra/org.chameleon.Boot.plist" plist = vol + boot if not os.path.exists(plist): Index: branches/blackosx/package/Scripts/Resolutions/1920x1200x32/postinstall =================================================================== --- branches/blackosx/package/Scripts/Resolutions/1920x1200x32/postinstall (revision 1573) +++ branches/blackosx/package/Scripts/Resolutions/1920x1200x32/postinstall (revision 1574) @@ -6,11 +6,11 @@ import shutil vol = str(sys.argv[3]) -extrafolder = vol + "/tmpcham/Extra" +extrafolder = vol + "/usr/local/chamTemp/Extra" if not os.path.exists(extrafolder): os.makedirs(extrafolder) -boot = "/tmpcham/Extra/org.chameleon.Boot.plist" +boot = "/usr/local/chamTemp/Extra/org.chameleon.Boot.plist" plist = vol + boot if not os.path.exists(plist): Index: branches/blackosx/package/Scripts/Resolutions/1280x768x32/postinstall =================================================================== --- branches/blackosx/package/Scripts/Resolutions/1280x768x32/postinstall (revision 1573) +++ branches/blackosx/package/Scripts/Resolutions/1280x768x32/postinstall (revision 1574) @@ -6,11 +6,11 @@ import shutil vol = str(sys.argv[3]) -extrafolder = vol + "/tmpcham/Extra" +extrafolder = vol + "/usr/local/chamTemp/Extra" if not os.path.exists(extrafolder): os.makedirs(extrafolder) -boot = "/tmpcham/Extra/org.chameleon.Boot.plist" +boot = "/usr/local/chamTemp/Extra/org.chameleon.Boot.plist" plist = vol + boot if not os.path.exists(plist): Index: branches/blackosx/package/Scripts/Resolutions/1600x900x32/postinstall =================================================================== --- branches/blackosx/package/Scripts/Resolutions/1600x900x32/postinstall (revision 1573) +++ branches/blackosx/package/Scripts/Resolutions/1600x900x32/postinstall (revision 1574) @@ -6,11 +6,11 @@ import shutil vol = str(sys.argv[3]) -extrafolder = vol + "/tmpcham/Extra" +extrafolder = vol + "/usr/local/chamTemp/Extra" if not os.path.exists(extrafolder): os.makedirs(extrafolder) -boot = "/tmpcham/Extra/org.chameleon.Boot.plist" +boot = "/usr/local/chamTemp/Extra/org.chameleon.Boot.plist" plist = vol + boot if not os.path.exists(plist): Index: branches/blackosx/package/Scripts/Resolutions/1280x1024x32/postinstall =================================================================== --- branches/blackosx/package/Scripts/Resolutions/1280x1024x32/postinstall (revision 1573) +++ branches/blackosx/package/Scripts/Resolutions/1280x1024x32/postinstall (revision 1574) @@ -6,11 +6,11 @@ import shutil vol = str(sys.argv[3]) -extrafolder = vol + "/tmpcham/Extra" +extrafolder = vol + "/usr/local/chamTemp/Extra" if not os.path.exists(extrafolder): os.makedirs(extrafolder) -boot = "/tmpcham/Extra/org.chameleon.Boot.plist" +boot = "/usr/local/chamTemp/Extra/org.chameleon.Boot.plist" plist = vol + boot if not os.path.exists(plist): Index: branches/blackosx/package/Scripts/Resolutions/1440x900x32/postinstall =================================================================== --- branches/blackosx/package/Scripts/Resolutions/1440x900x32/postinstall (revision 1573) +++ branches/blackosx/package/Scripts/Resolutions/1440x900x32/postinstall (revision 1574) @@ -6,11 +6,11 @@ import shutil vol = str(sys.argv[3]) -extrafolder = vol + "/tmpcham/Extra" +extrafolder = vol + "/usr/local/chamTemp/Extra" if not os.path.exists(extrafolder): os.makedirs(extrafolder) -boot = "/tmpcham/Extra/org.chameleon.Boot.plist" +boot = "/usr/local/chamTemp/Extra/org.chameleon.Boot.plist" plist = vol + boot if not os.path.exists(plist): Index: branches/blackosx/package/Scripts/Resolutions/1280x800x32/postinstall =================================================================== --- branches/blackosx/package/Scripts/Resolutions/1280x800x32/postinstall (revision 1573) +++ branches/blackosx/package/Scripts/Resolutions/1280x800x32/postinstall (revision 1574) @@ -6,11 +6,11 @@ import shutil vol = str(sys.argv[3]) -extrafolder = vol + "/tmpcham/Extra" +extrafolder = vol + "/usr/local/chamTemp/Extra" if not os.path.exists(extrafolder): os.makedirs(extrafolder) -boot = "/tmpcham/Extra/org.chameleon.Boot.plist" +boot = "/usr/local/chamTemp/Extra/org.chameleon.Boot.plist" plist = vol + boot if not os.path.exists(plist): Index: branches/blackosx/package/Scripts/Resolutions/1680x1050x32/postinstall =================================================================== --- branches/blackosx/package/Scripts/Resolutions/1680x1050x32/postinstall (revision 1573) +++ branches/blackosx/package/Scripts/Resolutions/1680x1050x32/postinstall (revision 1574) @@ -6,11 +6,11 @@ import shutil vol = str(sys.argv[3]) -extrafolder = vol + "/tmpcham/Extra" +extrafolder = vol + "/usr/local/chamTemp/Extra" if not os.path.exists(extrafolder): os.makedirs(extrafolder) -boot = "/tmpcham/Extra/org.chameleon.Boot.plist" +boot = "/usr/local/chamTemp/Extra/org.chameleon.Boot.plist" plist = vol + boot if not os.path.exists(plist): Index: branches/blackosx/package/Scripts/Resolutions/1920x1080x32/postinstall =================================================================== --- branches/blackosx/package/Scripts/Resolutions/1920x1080x32/postinstall (revision 1573) +++ branches/blackosx/package/Scripts/Resolutions/1920x1080x32/postinstall (revision 1574) @@ -6,11 +6,11 @@ import shutil vol = str(sys.argv[3]) -extrafolder = vol + "/tmpcham/Extra" +extrafolder = vol + "/usr/local/chamTemp/Extra" if not os.path.exists(extrafolder): os.makedirs(extrafolder) -boot = "/tmpcham/Extra/org.chameleon.Boot.plist" +boot = "/usr/local/chamTemp/Extra/org.chameleon.Boot.plist" plist = vol + boot if not os.path.exists(plist): Index: branches/blackosx/package/Scripts/Resolutions/1280x960x32/postinstall =================================================================== --- branches/blackosx/package/Scripts/Resolutions/1280x960x32/postinstall (revision 1573) +++ branches/blackosx/package/Scripts/Resolutions/1280x960x32/postinstall (revision 1574) @@ -6,11 +6,11 @@ import shutil vol = str(sys.argv[3]) -extrafolder = vol + "/tmpcham/Extra" +extrafolder = vol + "/usr/local/chamTemp/Extra" if not os.path.exists(extrafolder): os.makedirs(extrafolder) -boot = "/tmpcham/Extra/org.chameleon.Boot.plist" +boot = "/usr/local/chamTemp/Extra/org.chameleon.Boot.plist" plist = vol + boot if not os.path.exists(plist): Index: branches/blackosx/package/Scripts/Keymaps/postinstall =================================================================== --- branches/blackosx/package/Scripts/Keymaps/postinstall (revision 1573) +++ branches/blackosx/package/Scripts/Keymaps/postinstall (revision 1574) @@ -6,11 +6,11 @@ import shutil vol = str(sys.argv[3]) -extrafolder = vol + "/tmpcham/Extra" +extrafolder = vol + "/usr/local/chamTemp/Extra" if not os.path.exists(extrafolder): os.makedirs(extrafolder) -boot = "/tmpcham/Extra/org.chameleon.Boot.plist" +boot = "/usr/local/chamTemp/Extra/org.chameleon.Boot.plist" plist = vol + boot if not os.path.exists(plist): Index: branches/blackosx/package/buildpkg.sh =================================================================== --- branches/blackosx/package/buildpkg.sh (revision 1573) +++ branches/blackosx/package/buildpkg.sh (revision 1574) @@ -8,6 +8,10 @@ pkgroot="${0%/*}" +# blackosx to use /usr/local as a place for temporary files +# taken from http://en.wikipedia.org/wiki/Filesystem_Hierarchy_Standard#cite_note-27 +chamTemp="usr/local/chamTemp" + COL_BLACK="\x1b[30;01m" COL_RED="\x1b[31;01m" COL_GREEN="\x1b[32;01m" @@ -107,7 +111,7 @@ # build reset choice package mkdir -p ${1}/noboot/Root echo " [BUILD] Reset choice " - buildpackage "${1}/noboot" "/tmpcham" "" "start_visible=\"true\" start_selected=\"false\" selected=\"exclusive(choices['Standard']) && exclusive(choices['EFI'])\"" >/dev/null 2>&1 + buildpackage "${1}/noboot" "/$chamTemp" "" "start_visible=\"true\" start_selected=\"false\" selected=\"exclusive(choices['Standard']) && exclusive(choices['EFI'])\"" >/dev/null 2>&1 # End build reset choice package # build Modules package @@ -132,7 +136,7 @@ mkdir -p ${1}/klibc/Root ditto --noextattr --noqtn ${1%/*}/i386/modules/klibc.dylib ${1}/klibc/Root echo " [BUILD] klibc " - buildpackage "${1}/klibc" "/tmpcham/Extra/modules" "" "start_selected=\"true\"" >/dev/null 2>&1 #blackosx = add tmpcham to path + buildpackage "${1}/klibc" "/$chamTemp/Extra/modules" "" "start_selected=\"true\"" >/dev/null 2>&1 } fi # - @@ -141,24 +145,24 @@ mkdir -p ${1}/AutoReso/Root ditto --noextattr --noqtn ${1%/*}/i386/modules/Resolution.dylib ${1}/AutoReso/Root echo " [BUILD] Resolution " - buildpackage "${1}/AutoReso" "/tmpcham/Extra/modules" "" "start_selected=\"false\"" >/dev/null 2>&1 #blackosx = add tmpcham to path + buildpackage "${1}/AutoReso" "/$chamTemp/Extra/modules" "" "start_selected=\"false\"" >/dev/null 2>&1 } fi # - if [ -e ${1%/*}/i386/modules/Keylayout.dylib ]; then { - mkdir -p ${1}/Keylayout/Root/tmpcham/Extra/{modules,Keymaps} #blackosx = add tmpcham to path + mkdir -p ${1}/Keylayout/Root/$chamTemp/Extra/{modules,Keymaps} mkdir -p ${1}/Keylayout/Root/usr/bin layout_src_dir="${1%/sym/*}/i386/modules/Keylayout/layouts/layouts-src" if [ -d "$layout_src_dir" ];then # Create a tar.gz from layout sources (cd "$layout_src_dir"; \ - tar czf "${1}/Keylayout/Root/tmpcham/Extra/Keymaps/layouts-src.tar.gz" README *.slt) #blackosx = add tmpcham to path + tar czf "${1}/Keylayout/Root/$chamTemp/Extra/Keymaps/layouts-src.tar.gz" README *.slt) fi # Adding module - ditto --noextattr --noqtn ${1%/*}/i386/modules/Keylayout.dylib ${1}/Keylayout/Root/tmpcham/Extra/modules #blackosx = add tmpcham to path + ditto --noextattr --noqtn ${1%/*}/i386/modules/Keylayout.dylib ${1}/Keylayout/Root/$chamTemp/Extra/modules # Adding Keymaps - ditto --noextattr --noqtn ${1%/sym/*}/Keymaps ${1}/Keylayout/Root/tmpcham/Extra/Keymaps #blackosx = add tmpcham to path + ditto --noextattr --noqtn ${1%/sym/*}/Keymaps ${1}/Keylayout/Root/$chamTemp/Extra/Keymaps # Adding tools ditto --noextattr --noqtn ${1%/*}/i386/cham-mklayout ${1}/Keylayout/Root/usr/bin echo " [BUILD] Keylayout " @@ -172,7 +176,7 @@ ditto --noextattr --noqtn ${1%/*}/i386/modules/uClibcxx.dylib ${1}/uClibc/Root ditto --noextattr --noqtn ${1%/*}/i386/modules/klibc.dylib ${1}/uClibc/Root echo " [BUILD] uClibc++ " - buildpackage "${1}/uClibc" "/tmpcham/Extra/modules" "" "start_selected=\"true\"" >/dev/null 2>&1 #blackosx = add tmpcham to path + buildpackage "${1}/uClibc" "/$chamTemp/Extra/modules" "" "start_selected=\"true\"" >/dev/null 2>&1 } fi ((xmlindent--)) @@ -223,7 +227,6 @@ sed "s/@@KEYMAP@@/${keymaps[$i]}/g" "${pkgroot}/Scripts/Keymaps/postinstall" > "${1}/${keymaps[$i]}/Scripts/postinstall" && \ chmod +rx "${1}/${keymaps[$i]}/Scripts/postinstall" echo " [BUILD] ${keymaps[$i]} " -#blackosx = why use install location /tmpcham for this ? changing to root buildpackage "${1}/${keymaps[$i]}" "/" "" "start_selected=\"false\"" >/dev/null 2>&1 done ((xmlindent--)) @@ -243,7 +246,6 @@ mkdir -p "${1}/${resolutions[$i]##*/}/Scripts/" ditto --noextattr --noqtn "${resolutions[$i]}/postinstall" "${1}/${resolutions[$i]##*/}/Scripts/postinstall" echo " [BUILD] ${resolutions[$i]##*/} " -#blackosx = why use install location /tmpcham for this ? changing to root buildpackage "${1}/${resolutions[$i]##*/}" "/" "" "start_selected=\"false\"" >/dev/null 2>&1 done @@ -292,8 +294,7 @@ mkdir -p "${1}/${theme}/Root/" rsync -r --exclude=.svn "${themes[$i]}/" "${1}/${theme}/Root/${theme}" echo " [BUILD] ${theme}" -#blackosx = maybe use install location /tmpcham for this, then move at the end depending on standard to efi install? going to try it - buildpackage "${1}/${theme}" "/tmpcham/Extra/Themes" "" "start_selected=\"false\"" >/dev/null 2>&1 + buildpackage "${1}/${theme}" "/$chamTemp/Extra/Themes" "" "start_selected=\"false\"" >/dev/null 2>&1 done ((xmlindent--))