[PC-BSD Commits] r2480 - in pcbsd/trunk/installcd-overlay/usr/local/pcbsd/Components: . kdesdk kdetoys kdewebdev

[svn at pcbsd.org]

Author: kris
Date: 2008-07-29 06:38:51 -0700 (Tue, 29 Jul 2008)
New Revision: 2480

Removed:
   pcbsd/trunk/installcd-overlay/usr/local/pcbsd/Components/kdeoffice/
Modified:
   pcbsd/trunk/installcd-overlay/usr/local/pcbsd/Components/kdesdk/install.sh
   pcbsd/trunk/installcd-overlay/usr/local/pcbsd/Components/kdetoys/install.sh
   pcbsd/trunk/installcd-overlay/usr/local/pcbsd/Components/kdewebdev/install.sh
Log:

Fixed the rest of our optional components for network / internet installs



Modified: pcbsd/trunk/installcd-overlay/usr/local/pcbsd/Components/kdesdk/install.sh
===================================================================
--- pcbsd/trunk/installcd-overlay/usr/local/pcbsd/Components/kdesdk/install.sh	2008-07-29 13:34:53 UTC (rev 2479)
+++ pcbsd/trunk/installcd-overlay/usr/local/pcbsd/Components/kdesdk/install.sh	2008-07-29 13:38:51 UTC (rev 2480)
@@ -1,11 +1,23 @@
 #!/bin/sh
-# This script installs the KDE edu package
+# This script installs the KDE SDK package
 
+# Configuration file
+. /usr/local/pcbsd/scripts/PCBSD.Config
+
+DISPLAY=""; export DISPLAY
+
 mkdir -p /mnt/tmp/components
 
-cp /cdmnt/components/kdesdk* /mnt/tmp/components/
-cp /cdmnt/components/kdevelop* /mnt/tmp/components/
+# If we are on a network connection
+if [ -e "/tmp/networkURL" ]
+then
+  cd ${FSMNT}/tmp/components
+  ${FETCHCMD} ${NETPATH}/components/${KDESDK}
+else
+  cp /cdmnt/components/${KDESDK} /mnt/tmp/components/
+fi
 
+
 # Make our install script
 echo '#!/bin/sh
 cd /tmp/components/

Modified: pcbsd/trunk/installcd-overlay/usr/local/pcbsd/Components/kdetoys/install.sh
===================================================================
--- pcbsd/trunk/installcd-overlay/usr/local/pcbsd/Components/kdetoys/install.sh	2008-07-29 13:34:53 UTC (rev 2479)
+++ pcbsd/trunk/installcd-overlay/usr/local/pcbsd/Components/kdetoys/install.sh	2008-07-29 13:38:51 UTC (rev 2480)
@@ -1,10 +1,23 @@
 #!/bin/sh
 # This script installs the KDE toys package
 
+# Configuration file
+. /usr/local/pcbsd/scripts/PCBSD.Config
+
+DISPLAY=""; export DISPLAY
+
 mkdir -p /mnt/tmp/components
 
-cp /cdmnt/components/kdetoys* /mnt/tmp/components/
+# If we are on a network connection
+if [ -e "/tmp/networkURL" ]
+then
+  cd ${FSMNT}/tmp/components
+  ${FETCHCMD} ${NETPATH}/components/${KDETOYS}
+else
+  cp /cdmnt/components/${KDETOYS} /mnt/tmp/components/
+fi
 
+
 # Make our install script
 echo '#!/bin/sh
 cd /tmp/components/

Modified: pcbsd/trunk/installcd-overlay/usr/local/pcbsd/Components/kdewebdev/install.sh
===================================================================
--- pcbsd/trunk/installcd-overlay/usr/local/pcbsd/Components/kdewebdev/install.sh	2008-07-29 13:34:53 UTC (rev 2479)
+++ pcbsd/trunk/installcd-overlay/usr/local/pcbsd/Components/kdewebdev/install.sh	2008-07-29 13:38:51 UTC (rev 2480)
@@ -1,9 +1,21 @@
 #!/bin/sh
 # This script installs the KDE web dev package
 
+# Configuration file
+. /usr/local/pcbsd/scripts/PCBSD.Config
+
+DISPLAY=""; export DISPLAY
+
 mkdir -p /mnt/tmp/components
 
-cp /cdmnt/components/kdewebdev* /mnt/tmp/components/
+# If we are on a network connection
+if [ -e "/tmp/networkURL" ]
+then
+  cd ${FSMNT}/tmp/components
+  ${FETCHCMD} ${NETPATH}/components/${KDEWEBDEV}
+else
+  cp /cdmnt/components/${KDEWEBDEV} /mnt/tmp/components/
+fi
 
 # Make our install script
 echo '#!/bin/sh