[PC-BSD Commits] r4006 - in pcbsd/trunk/installcd-overlay/usr/local/pcbsd: LANGS scripts

svn at pcbsd.org svn at pcbsd.org
Fri May 29 07:19:07 PDT 2009


Author: kris
Date: 2009-05-29 07:19:06 -0700 (Fri, 29 May 2009)
New Revision: 4006

Modified:
   pcbsd/trunk/installcd-overlay/usr/local/pcbsd/LANGS/PCInstall_fr.qm
   pcbsd/trunk/installcd-overlay/usr/local/pcbsd/LANGS/PCInstall_nb.qm
   pcbsd/trunk/installcd-overlay/usr/local/pcbsd/LANGS/PCInstall_pl.qm
   pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.AddUser.sh
   pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.FindUpdateParts.sh
   pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.Localize.sh
   pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.PostUpgrade.sh
   pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.PreUpgrade.sh
   pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SysConfig.sh
Log:

Also update install scripts to use /usr/PCBSD/local now



Modified: pcbsd/trunk/installcd-overlay/usr/local/pcbsd/LANGS/PCInstall_fr.qm
===================================================================
(Binary files differ)

Modified: pcbsd/trunk/installcd-overlay/usr/local/pcbsd/LANGS/PCInstall_nb.qm
===================================================================
(Binary files differ)

Modified: pcbsd/trunk/installcd-overlay/usr/local/pcbsd/LANGS/PCInstall_pl.qm
===================================================================
(Binary files differ)

Modified: pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.AddUser.sh
===================================================================
--- pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.AddUser.sh	2009-05-29 14:12:31 UTC (rev 4005)
+++ pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.AddUser.sh	2009-05-29 14:19:06 UTC (rev 4006)
@@ -39,16 +39,16 @@
 then
 
 # Add the auto-login user line
-sed -e "s/AutoLoginUser=/AutoLoginUser=${FirstUser}/g" ${FSMNT}/PCBSD/local/kde4/share/config/kdm/kdmrc  > ${FSMNT}/tmp/sed
+sed -e "s/AutoLoginUser=/AutoLoginUser=${FirstUser}/g" ${FSMNT}/usr/PCBSD/local/kde4/share/config/kdm/kdmrc  > ${FSMNT}/tmp/sed
 
-mv ${FSMNT}/tmp/sed ${FSMNT}/PCBSD/local/kde4/share/config/kdm/kdmrc
+mv ${FSMNT}/tmp/sed ${FSMNT}/usr/PCBSD/local/kde4/share/config/kdm/kdmrc
 
 else
 
 # Add the auto-login user line
-sed -e "s/AutoLoginEnable=true/AutoLoginEnable=false/g" ${FSMNT}/PCBSD/local/kde4/share/config/kdm/kdmrc  > ${FSMNT}/tmp/sed
+sed -e "s/AutoLoginEnable=true/AutoLoginEnable=false/g" ${FSMNT}/usr/PCBSD/local/kde4/share/config/kdm/kdmrc  > ${FSMNT}/tmp/sed
 
-mv ${FSMNT}/tmp/sed ${FSMNT}/PCBSD/local/kde4/share/config/kdm/kdmrc
+mv ${FSMNT}/tmp/sed ${FSMNT}/usr/PCBSD/local/kde4/share/config/kdm/kdmrc
 
 fi
 

Modified: pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.FindUpdateParts.sh
===================================================================
--- pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.FindUpdateParts.sh	2009-05-29 14:12:31 UTC (rev 4005)
+++ pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.FindUpdateParts.sh	2009-05-29 14:19:06 UTC (rev 4006)
@@ -71,7 +71,7 @@
 
 
   
-    if [ -e "${FSMNT}/PCBSD" ]
+    if [ -e "${FSMNT}/PCBSD" -o -e "${FSMNT}/usr/PCBSD" ]
     then
 
       # Create Script

Modified: pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.Localize.sh
===================================================================
--- pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.Localize.sh	2009-05-29 14:12:31 UTC (rev 4005)
+++ pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.Localize.sh	2009-05-29 14:19:06 UTC (rev 4006)
@@ -169,8 +169,8 @@
 
 #Change KDM Langs
 ##########################################################################
-sed -e "s/Language=en_US/Language=${SETKDMLANG}/g" ${FSMNT}/PCBSD/local/kde4/share/config/kdm/kdmrc > ${FSMNT}/tmp/sed
-mv ${FSMNT}/tmp/sed ${FSMNT}/PCBSD/local/kde4/share/config/kdm/kdmrc
+sed -e "s/Language=en_US/Language=${SETKDMLANG}/g" ${FSMNT}/usr/PCBSD/local/kde4/share/config/kdm/kdmrc > ${FSMNT}/tmp/sed
+mv ${FSMNT}/tmp/sed ${FSMNT}/usr/PCBSD/local/kde4/share/config/kdm/kdmrc
 
 # Change the profile and csh.cshrc file
 ###########################################################################

Modified: pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.PostUpgrade.sh
===================================================================
--- pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.PostUpgrade.sh	2009-05-29 14:12:31 UTC (rev 4005)
+++ pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.PostUpgrade.sh	2009-05-29 14:19:06 UTC (rev 4006)
@@ -26,7 +26,7 @@
         grep "/usr/local" ${f} >/dev/null 2>/dev/null
         if [ "$?" = "0" ]
         then
-          sed -e "s|/usr/local|/PCBSD/local|g" ${f} >${f}.tmp
+          sed -e "s|/usr/local|/usr/PCBSD/local|g" ${f} >${f}.tmp
           mv ${f}.tmp ${f}
         fi
       fi
@@ -69,8 +69,8 @@
 then
    USER="`cat /tmp/autologinuser`"
    # Add the auto-login user line
-   sed -e "s/AutoLoginUser=/AutoLoginUser=${USER}/g" ${FSMNT}/PCBSD/local/kde4/share/config/kdm/kdmrc  > ${FSMNT}/tmp/sed
-   mv ${FSMNT}/tmp/sed ${FSMNT}/PCBSD/local/kde4/share/config/kdm/kdmrc
+   sed -e "s/AutoLoginUser=/AutoLoginUser=${USER}/g" ${FSMNT}/usr/PCBSD/local/kde4/share/config/kdm/kdmrc  > ${FSMNT}/tmp/sed
+   mv ${FSMNT}/tmp/sed ${FSMNT}/usr/PCBSD/local/kde4/share/config/kdm/kdmrc
 fi
 
 

Modified: pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.PreUpgrade.sh
===================================================================
--- pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.PreUpgrade.sh	2009-05-29 14:12:31 UTC (rev 4005)
+++ pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.PreUpgrade.sh	2009-05-29 14:19:06 UTC (rev 4006)
@@ -24,12 +24,28 @@
   fi
 fi
 
+if [ -e "${FSMNT}/usr/PCBSD/local/kde4/share/config/kdm/kdmrc" ]
+then
+   grep "^AutoLoginEnable=true" ${FSMNT}/usr/PCBSD/local/kde4/share/config/kdm/kdmrc >/dev/null 2>/dev/null
+  if [ "$?" = "0" ]
+  then 
+   grep "^AutoLoginUser=" ${FSMNT}/usr/PCBSD/local/kde4/share/config/kdm/kdmrc | cut -d "=" -f 2 >/tmp/autologinuser
+  fi
+fi
+
+
 # Save any PBI mime data
 if [ -d "${FSMNT}/PCBSD/local" ]
 then
   tar cvf ${FSMNT}/pbimimedata.tar ${FSMNT}/PCBSD/local/kde4/share/applnk/.hidden ${FSMNT}/PCBSD/local/share/mime/packages ${FSMNT}/PCBSD/local/share/applications/mimeapps.list
 fi
 
+# Save any PBI mime data
+if [ -d "${FSMNT}/usr/PCBSD/local" ]
+then
+  tar cvf ${FSMNT}/pbimimedata.tar ${FSMNT}/usr/PCBSD/local/kde4/share/applnk/.hidden ${FSMNT}/usr/PCBSD/local/share/mime/packages ${FSMNT}/usr/PCBSD/local/share/applications/mimeapps.list
+fi
+
 cd ${FSMNT}
 
 # Clean up some of the /PCBSD entries before starting an upgrade
@@ -37,12 +53,17 @@
 chflags -R noschg ${FSMNT}
 echo "Cleaning old FileSystem... This may take a while.."
 rm -rf ${FSMNT}/PCBSD/local
+rm -rf ${FSMNT}/usr/PCBSD/local
 echo "Cleaning old FileSystem... This may take a while..."
 rm -rf ${FSMNT}/PCBSD/Scripts
+rm -rf ${FSMNT}/usr/PCBSD/Scripts
 rm -rf ${FSMNT}/PCBSD/bin
+rm -rf ${FSMNT}/usr/PCBSD/bin
 echo "Cleaning old FileSystem... This may take a while...."
 rm -rf ${FSMNT}/PCBSD/packages
+rm -rf ${FSMNT}/usr/PCBSD/packages
 rm -rf ${FSMNT}/PCBSD/Components
+rm -rf ${FSMNT}/usr/PCBSD/Components
 rm -rf ${FSMNT}/PCBSD/SystemUpdater
 echo "Cleaning old FileSystem... This may take a while....."
 rm -rf ${FSMNT}/PCBSD/docs

Modified: pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SysConfig.sh
===================================================================
--- pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SysConfig.sh	2009-05-29 14:12:31 UTC (rev 4005)
+++ pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SysConfig.sh	2009-05-29 14:19:06 UTC (rev 4006)
@@ -41,17 +41,17 @@
 
 
 # Copy the new splash screen over
-cp ${FSMNT}/PCBSD/splash-screens/loading-screen-en.pcx ${FSMNT}/boot/loading-screen.pcx
+cp ${FSMNT}/usr/PCBSD/splash-screens/loading-screen-en.pcx ${FSMNT}/boot/loading-screen.pcx
 
 # Copy over the working xorg.conf file from the install CD to the booted
 # system. This will allow us to run the Xorg configuration tool at first boot
-cat /etc/X11/xorg.conf | sed 's|/usr/local|/PCBSD/local|g' > ${FSMNT}/etc/X11/xorg.conf
-cp ${FSMNT}/etc/X11/xorg.conf ${FSMNT}/PCBSD/xorg-gui/conf/xorg.conf.basic
+cat /etc/X11/xorg.conf | sed 's|/usr/local|/usr/PCBSD/local|g' > ${FSMNT}/etc/X11/xorg.conf
+cp ${FSMNT}/etc/X11/xorg.conf ${FSMNT}/usr/PCBSD/xorg-gui/conf/xorg.conf.basic
 
 # Copy over the ttys script, which starts the autodetect process if on desktop
-if [ ! -e "${FSMNT}/PCBSD/conf/server-install" ]
+if [ ! -e "${FSMNT}/usr/PCBSD/conf/server-install" ]
 then
-  cp ${FSMNT}/PCBSD/xorg-gui/conf/ttys.xsetup ${FSMNT}/etc/ttys
+  cp ${FSMNT}/usr/PCBSD/xorg-gui/conf/ttys.xsetup ${FSMNT}/etc/ttys
 fi
 
 
@@ -84,9 +84,9 @@
 fi 
 
 # Clear out the periodic date files
-rm ${FSMNT}/PCBSD/conf/.daily
-rm ${FSMNT}/PCBSD/conf/.weekly
-rm ${FSMNT}/PCBSD/conf/.monthly
+rm ${FSMNT}/usr/PCBSD/conf/.daily
+rm ${FSMNT}/usr/PCBSD/conf/.weekly
+rm ${FSMNT}/usr/PCBSD/conf/.monthly
 
 # Make sure cups logs are cleared
 echo "" > ${FSMNT}/var/log/cups/access_log
@@ -123,7 +123,7 @@
 if [ "${LANG}" != "en" ]
 then
    # Copy the right splash screen over
-    cp ${FSMNT}/PCBSD/splash-screens/loading-screen-${LANG}.pcx ${FSMNT}/boot/loading-screen.pcx
+    cp ${FSMNT}/usr/PCBSD/splash-screens/loading-screen-${LANG}.pcx ${FSMNT}/boot/loading-screen.pcx
    # Run the Localize script
    /usr/local/pcbsd/scripts/PCBSD.Localize.sh ${LANG} ${KEYLAYOUT}
 else
@@ -150,9 +150,9 @@
 
 # Any post install stuff here
 echo "#!/bin/sh
-cd /PCBSD/local/share/mime
-update-mime-database /PCBSD/local/share/mime
-update-mime-database /PCBSD/local/kde4/share/mime
+cd /usr/PCBSD/local/share/mime
+update-mime-database /usr/PCBSD/local/share/mime
+update-mime-database /usr/PCBSD/local/kde4/share/mime
 " >${FSMNT}/tmp/RunOnSys.sh
 
 chmod 755 ${FSMNT}/tmp/RunOnSys.sh



More information about the Commits mailing list