[PC-BSD Commits] r2366 - pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts

svn at pcbsd.org svn at pcbsd.org
Thu Jul 17 08:30:43 PDT 2008


Author: kris
Date: 2008-07-17 08:30:43 -0700 (Thu, 17 Jul 2008)
New Revision: 2366

Modified:
   pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.AddUser.sh
   pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.LaptopSetup.sh
   pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.Localize.sh
   pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.NetConfig.sh
   pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SaveKeyboard.sh
   pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SysConfig.sh
Log:

Update the installer to work on .kde4 directories now, not .kde



Modified: pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.AddUser.sh
===================================================================
--- pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.AddUser.sh	2008-07-17 15:24:17 UTC (rev 2365)
+++ pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.AddUser.sh	2008-07-17 15:30:43 UTC (rev 2366)
@@ -57,5 +57,5 @@
 rm -f ${FSMNT}/tmp/users
 rm -f ${FSMNT}/tmp/SetPerms
 
-# Copy the .kde defaults to root's dir
-cp -r ${FSMNT}/usr/share/skel/.kde ${FSMNT}/root/
+# Copy the .kde4 defaults to root's dir
+cp -r ${FSMNT}/usr/share/skel/.kde4 ${FSMNT}/root/

Modified: pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.LaptopSetup.sh
===================================================================
--- pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.LaptopSetup.sh	2008-07-17 15:24:17 UTC (rev 2365)
+++ pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.LaptopSetup.sh	2008-07-17 15:30:43 UTC (rev 2366)
@@ -5,17 +5,17 @@
 
 # Disable the numlock setup
 #Change the skel files
-sed -e "s/NumLock=2/NumLock=0/g" ${FSMNT}/usr/share/skel/.kde/share/config/kcminputrc  > ${FSMNT}/tmp/sed
+sed -e "s/NumLock=2/NumLock=0/g" ${FSMNT}/usr/share/skel/.kde4/share/config/kcminputrc  > ${FSMNT}/tmp/sed
 
-mv ${FSMNT}/tmp/sed ${FSMNT}/usr/share/skel/.kde/share/config/kcminputrc
+mv ${FSMNT}/tmp/sed ${FSMNT}/usr/share/skel/.kde4/share/config/kcminputrc
 
 # now change all the user accounts
 cd ${FSMNT}/usr/home
 for i in `ls`
 do
-sed -e "s/NumLock=2/NumLock=0/g" ${FSMNT}/usr/home/${i}/.kde/share/config/kcminputrc  > ${FSMNT}/tmp/sed
+sed -e "s/NumLock=2/NumLock=0/g" ${FSMNT}/usr/home/${i}/.kde4/share/config/kcminputrc  > ${FSMNT}/tmp/sed
 
-mv ${FSMNT}/tmp/sed ${FSMNT}/usr/home/${i}/.kde/share/config/kcminputrc
+mv ${FSMNT}/tmp/sed ${FSMNT}/usr/home/${i}/.kde4/share/config/kcminputrc
 done
 
 

Modified: pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.Localize.sh
===================================================================
--- pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.Localize.sh	2008-07-17 15:24:17 UTC (rev 2365)
+++ pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.Localize.sh	2008-07-17 15:30:43 UTC (rev 2366)
@@ -154,31 +154,31 @@
 
 #Change the skel files
 ##########################################################################
-sed -e "s/Country=us/Country=${COUNTRY}/g" ${FSMNT}/usr/share/skel/.kde/share/config/kdeglobals  > ${FSMNT}/tmp/sed
+sed -e "s/Country=us/Country=${COUNTRY}/g" ${FSMNT}/usr/share/skel/.kde4/share/config/kdeglobals  > ${FSMNT}/tmp/sed
 
-mv ${FSMNT}/tmp/sed ${FSMNT}/usr/share/skel/.kde/share/config/kdeglobals
+mv ${FSMNT}/tmp/sed ${FSMNT}/usr/share/skel/.kde4/share/config/kdeglobals
 
 # Change the language
 ##########################################################################
-sed -e "s/Language=en_US/Language=${SETLANG}/g" ${FSMNT}/usr/share/skel/.kde/share/config/kdeglobals > ${FSMNT}/tmp/sed
+sed -e "s/Language=en_US/Language=${SETLANG}/g" ${FSMNT}/usr/share/skel/.kde4/share/config/kdeglobals > ${FSMNT}/tmp/sed
 
-mv ${FSMNT}/tmp/sed ${FSMNT}/usr/share/skel/.kde/share/config/kdeglobals 
+mv ${FSMNT}/tmp/sed ${FSMNT}/usr/share/skel/.kde4/share/config/kdeglobals 
 
 # Change the keyboard layout tool
 ##########################################################################
-sed -e "s/CHANGEME/us,${KEYLAYOUT}/g" ${FSMNT}/usr/share/skel/.kde/share/config/kxkbrc > ${FSMNT}/tmp/sed
+sed -e "s/CHANGEME/us,${KEYLAYOUT}/g" ${FSMNT}/usr/share/skel/.kde4/share/config/kxkbrc > ${FSMNT}/tmp/sed
 
-mv ${FSMNT}/tmp/sed ${FSMNT}/usr/share/skel/.kde/share/config/kxkbrc
+mv ${FSMNT}/tmp/sed ${FSMNT}/usr/share/skel/.kde4/share/config/kxkbrc
 
 #Change the root files
 ##########################################################################
-sed -e "s/Country=C/Country=${COUNTRY}/g" ${FSMNT}/root/.kde/share/config/kdeglobals  > ${FSMNT}/tmp/sed
+sed -e "s/Country=C/Country=${COUNTRY}/g" ${FSMNT}/root/.kde4/share/config/kdeglobals  > ${FSMNT}/tmp/sed
 
-mv ${FSMNT}/tmp/sed ${FSMNT}/root/.kde/share/config/kdeglobals
+mv ${FSMNT}/tmp/sed ${FSMNT}/root/.kde4/share/config/kdeglobals
 
-sed -e "s/Language=en_US/Language=${SETLANG}/g" ${FSMNT}/root/.kde/share/config/kdeglobals > ${FSMNT}/tmp/sed
+sed -e "s/Language=en_US/Language=${SETLANG}/g" ${FSMNT}/root/.kde4/share/config/kdeglobals > ${FSMNT}/tmp/sed
 
-mv ${FSMNT}/tmp/sed ${FSMNT}/root/.kde/share/config/kdeglobals 
+mv ${FSMNT}/tmp/sed ${FSMNT}/root/.kde4/share/config/kdeglobals 
 
 #Change KDM Langs
 ##########################################################################
@@ -227,22 +227,22 @@
   chroot ${FSMNT} /tmp/SetProfile
   rm -f ${FSMNT}/tmp/SetProfile
 
-  if [ -f "${FSMNT}/usr/home/${i}/.kde/share/config/kdeglobals" ]
+  if [ -f "${FSMNT}/usr/home/${i}/.kde4/share/config/kdeglobals" ]
   then
-  sed -e "s/Country=us/Country=${COUNTRY}/g" ${FSMNT}/usr/home/${i}/.kde/share/config/kdeglobals  > ${FSMNT}/tmp/sed
+  sed -e "s/Country=us/Country=${COUNTRY}/g" ${FSMNT}/usr/home/${i}/.kde4/share/config/kdeglobals  > ${FSMNT}/tmp/sed
 
-  mv ${FSMNT}/tmp/sed ${FSMNT}/usr/home/${i}/.kde/share/config/kdeglobals
+  mv ${FSMNT}/tmp/sed ${FSMNT}/usr/home/${i}/.kde4/share/config/kdeglobals
 
-  sed -e "s/Language=en_US/Language=${SETLANG}/g" ${FSMNT}/usr/home/${i}/.kde/share/config/kdeglobals > ${FSMNT}/tmp/sed
+  sed -e "s/Language=en_US/Language=${SETLANG}/g" ${FSMNT}/usr/home/${i}/.kde4/share/config/kdeglobals > ${FSMNT}/tmp/sed
 
-  mv ${FSMNT}/tmp/sed ${FSMNT}/usr/home/${i}/.kde/share/config/kdeglobals 
+  mv ${FSMNT}/tmp/sed ${FSMNT}/usr/home/${i}/.kde4/share/config/kdeglobals 
 
   fi
 
   # Change the keyboard layout tool
-  sed -e "s/CHANGEME/us,${KEYLAYOUT}/g" ${FSMNT}/usr/home/${i}/.kde/share/config/kxkbrc > ${FSMNT}/tmp/sed
+  sed -e "s/CHANGEME/us,${KEYLAYOUT}/g" ${FSMNT}/usr/home/${i}/.kde4/share/config/kxkbrc > ${FSMNT}/tmp/sed
 
-  mv ${FSMNT}/tmp/sed ${FSMNT}/usr/home/${i}/.kde/share/config/kxkbrc
+  mv ${FSMNT}/tmp/sed ${FSMNT}/usr/home/${i}/.kde4/share/config/kxkbrc
 done
 
 # Set the keylayout in rc.conf

Modified: pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.NetConfig.sh
===================================================================
--- pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.NetConfig.sh	2008-07-17 15:24:17 UTC (rev 2365)
+++ pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.NetConfig.sh	2008-07-17 15:30:43 UTC (rev 2366)
@@ -69,8 +69,8 @@
 Exec=/PCBSD/networkmanager/bin/NetworkTray ${FLAG} ${i}0
 Icon=network
 StartupNotify=false
-Type=Application" > ${FSMNT}/usr/home/${u}/.kde/Autostart/tray-${i}0.desktop
-       chmod 755 ${FSMNT}/usr/home/${u}/.kde/Autostart/tray-${i}0.esktop
+Type=Application" > ${FSMNT}/usr/home/${u}/.kde4/Autostart/tray-${i}0.desktop
+       chmod 755 ${FSMNT}/usr/home/${u}/.kde4/Autostart/tray-${i}0.esktop
      done
    fi
 
@@ -91,8 +91,8 @@
 Exec=/PCBSD/networkmanager/bin/NetworkTray ${FLAG} ${i}1
 Icon=network
 StartupNotify=false
-Type=Application" > ${FSMNT}/usr/home/${u}/.kde/Autostart/tray-${i}1.desktop
-       chmod 755 ${FSMNT}/usr/home/${u}/.kde/Autostart/tray-${i}1.esktop
+Type=Application" > ${FSMNT}/usr/home/${u}/.kde4/Autostart/tray-${i}1.desktop
+       chmod 755 ${FSMNT}/usr/home/${u}/.kde4/Autostart/tray-${i}1.esktop
      done
      
    fi

Modified: pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SaveKeyboard.sh
===================================================================
--- pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SaveKeyboard.sh	2008-07-17 15:24:17 UTC (rev 2365)
+++ pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SaveKeyboard.sh	2008-07-17 15:30:43 UTC (rev 2366)
@@ -33,7 +33,7 @@
 # Change KDE keyboard model
 change_kxkbrc() {
 
-    KXKBRC="${FSMNT}/usr/share/skel/.kde/share/config/kxkbrc"
+    KXKBRC="${FSMNT}/usr/share/skel/.kde4/share/config/kxkbrc"
     KXKBRC_TMP="${FSMNT}/kxkbrc.tmp"
     cp ${KXKBRC} ${KXKBRC_TMP}
     sed "s/Model=pc104/Model=${MODEL}/" < ${KXKBRC_TMP} > ${KXKBRC}
@@ -44,11 +44,11 @@
 
     for i in `ls ${FSMNT}/usr/home`
     do
-	KXKBRC="${FSMNT}/usr/home/${i}/.kde/share/config/kxkbrc"
+	KXKBRC="${FSMNT}/usr/home/${i}/.kde4/share/config/kxkbrc"
 	cp ${KXKBRC} ${KXKBRC_TMP}
 	sed "s/Model=pc104/Model=${MODEL}/" < ${KXKBRC_TMP} > ${KXKBRC}
 	
-        KXKBRC="${FSMNT}/usr/home/${i}/.kde/share/config/kxkbrc"
+        KXKBRC="${FSMNT}/usr/home/${i}/.kde4/share/config/kxkbrc"
 	cp ${KXKBRC} ${KXKBRC_TMP}
 	sed "s/CHANGEME/${KEYMAP}/" < ${KXKBRC_TMP} > ${KXKBRC}
     done

Modified: pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SysConfig.sh
===================================================================
--- pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SysConfig.sh	2008-07-17 15:24:17 UTC (rev 2365)
+++ pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SysConfig.sh	2008-07-17 15:30:43 UTC (rev 2366)
@@ -52,13 +52,13 @@
 else
 
   # Remove the keyboard switcher from loading
-  rm ${FSMNT}/usr/share/skel/.kde/share/config/kxkbrc
+  rm ${FSMNT}/usr/share/skel/.kde4/share/config/kxkbrc
 
   # Remove it from the user profiles as well
   cd ${FSMNT}/usr/home
   for i in `ls`
   do
-    rm ${FSMNT}/usr/home/${i}/.kde/share/config/kxkbrc
+    rm ${FSMNT}/usr/home/${i}/.kde4/share/config/kxkbrc
   done
   cd / 
 



More information about the Commits mailing list