[PC-BSD Commits] r2537 - in pcbsd/trunk/system-overlay/PCBSD/Components: . kdeedu kdesdk kdetoys ports source

svn at pcbsd.org svn at pcbsd.org
Wed Aug 6 08:39:56 PDT 2008


Author: kris
Date: 2008-08-06 08:39:56 -0700 (Wed, 06 Aug 2008)
New Revision: 2537

Added:
   pcbsd/trunk/system-overlay/PCBSD/Components/kdeedu/pkg-config.sh
   pcbsd/trunk/system-overlay/PCBSD/Components/kdesdk/pkg-config.sh
   pcbsd/trunk/system-overlay/PCBSD/Components/kdetoys/pkg-config.sh
   pcbsd/trunk/system-overlay/PCBSD/Components/ports/pkg-config.sh
   pcbsd/trunk/system-overlay/PCBSD/Components/source/pkg-config.sh
Removed:
   pcbsd/trunk/system-overlay/PCBSD/Components/kdegames/
   pcbsd/trunk/system-overlay/PCBSD/Components/kdeoffice/
Modified:
   pcbsd/trunk/system-overlay/PCBSD/Components/kdeedu/install.sh
   pcbsd/trunk/system-overlay/PCBSD/Components/kdesdk/install.sh
   pcbsd/trunk/system-overlay/PCBSD/Components/kdetoys/install.sh
   pcbsd/trunk/system-overlay/PCBSD/Components/ports/install.sh
   pcbsd/trunk/system-overlay/PCBSD/Components/source/install.sh
Log:

Updated our Components scripts to work with the update to PBM. Now they will
be able to install via the internet or CD / DVD



Modified: pcbsd/trunk/system-overlay/PCBSD/Components/kdeedu/install.sh
===================================================================
--- pcbsd/trunk/system-overlay/PCBSD/Components/kdeedu/install.sh	2008-08-06 15:31:34 UTC (rev 2536)
+++ pcbsd/trunk/system-overlay/PCBSD/Components/kdeedu/install.sh	2008-08-06 15:39:56 UTC (rev 2537)
@@ -4,93 +4,10 @@
 # Set our variables
 #############################################################################
 
-CDMNT="/tmp/pcbsdcdmnt"
-MNTLOC=""
+FILEDIR="${1}"
 PACKAGE="kdeedu-*.tbz"
 
 # Start install
 #############################################################################
 
-while
-i=1
-do
-
-# Prompt for CD 2
-kdialog --msgbox "Please insert PC-BSD 1.4 CD2 and click OK when ready"
-
-mkdir ${CDMNT}
-mount_cd9660 /dev/cd0 ${CDMNT} >/dev/null 2>/dev/null
-if [ -e "${CDMNT}/README-PBI.txt" ]
-then
-  MNTLOC="${CDMNT}/components"
-  break
-fi
-umount ${CDMNT}
-
-mount_cd9660 /dev/cd1 ${CDMNT} >/dev/null 2>/dev/null
-if [ -e "${CDMNT}/README-PBI.txt" ]
-then
-  MNTLOC="${CDMNT}/components"
-  break
-fi
-umount ${CDMNT}
-
-mount_cd9660 /dev/acd0 ${CDMNT} >/dev/null 2>/dev/null
-if [ -e "${CDMNT}/README-PBI.txt" ]
-then
-  MNTLOC="${CDMNT}/components"
-  break
-fi
-umount ${CDMNT}
-
-mount_cd9660 /dev/acd1 ${CDMNT} >/dev/null 2>/dev/null
-if [ -e "${CDMNT}/README-PBI.txt" ]
-then
-  MNTLOC="${CDMNT}/components"
-  break
-fi
-umount ${CDMNT}
-
-break
-
-done
-
-# Did we find the CD?
-if [ "${MNTLOC}" = "" ] 
-then
-  # Ask the user if they wish to locate file manually
-  kdialog --yesno "PC-BSD CD #2 could not be found.\n Do you wish to specify the package location manually?"
-  if [ "$?" = "0" ]
-  then
-    LOC=`kdialog --getopenfilename '/home' ${PACKAGE}`
-
-     if [ ! -e "${LOC}" ]
-     then
-        kdialog --error "Error: Package not found!"
-     fi
-
-     pkg_add -f ${LOC}
-     if [ "$?" = "0" ]
-     then
-       exit 0
-     else
-       exit 1
-     fi
-
-  fi
-
-else # End of manual install routine
-
-pkg_add -f ${MNTLOC}/${PACKAGE}
-if [ "$?" = "0" ]
-then
-  cd /
-  umount -f ${CDMNT}
-  exit 0
-else
-  cd /
-  umount -f ${CDMNT}
-  exit 1
-fi
-
-fi # End of CD Install routine
+pkg_add -f ${FILEDIR}/${PACKAGE}


Property changes on: pcbsd/trunk/system-overlay/PCBSD/Components/kdeedu/pkg-config.sh
___________________________________________________________________
Added: svn:executable
   + *

Modified: pcbsd/trunk/system-overlay/PCBSD/Components/kdesdk/install.sh
===================================================================
--- pcbsd/trunk/system-overlay/PCBSD/Components/kdesdk/install.sh	2008-08-06 15:31:34 UTC (rev 2536)
+++ pcbsd/trunk/system-overlay/PCBSD/Components/kdesdk/install.sh	2008-08-06 15:39:56 UTC (rev 2537)
@@ -4,101 +4,10 @@
 # Set our variables
 #############################################################################
 
-CDMNT="/tmp/pcbsdcdmnt"
-MNTLOC=""
+FILEDIR="${1}"
 PACKAGE="kdesdk-*.tbz"
-PACKAGE2="kdevelop-*.tbz"
 
 # Start install
 #############################################################################
 
-while
-i=1
-do
-
-# Prompt for CD 2
-kdialog --msgbox "Please insert PC-BSD 1.4 CD2 and click OK when ready"
-
-mkdir ${CDMNT}
-mount_cd9660 /dev/cd0 ${CDMNT} >/dev/null 2>/dev/null
-if [ -e "${CDMNT}/README-PBI.txt" ]
-then
-  MNTLOC="${CDMNT}/components"
-  break
-fi
-umount ${CDMNT}
-
-mount_cd9660 /dev/cd1 ${CDMNT} >/dev/null 2>/dev/null
-if [ -e "${CDMNT}/README-PBI.txt" ]
-then
-  MNTLOC="${CDMNT}/components"
-  break
-fi
-umount ${CDMNT}
-
-mount_cd9660 /dev/acd0 ${CDMNT} >/dev/null 2>/dev/null
-if [ -e "${CDMNT}/README-PBI.txt" ]
-then
-  MNTLOC="${CDMNT}/components"
-  break
-fi
-umount ${CDMNT}
-
-mount_cd9660 /dev/acd1 ${CDMNT} >/dev/null 2>/dev/null
-if [ -e "${CDMNT}/README-PBI.txt" ]
-then
-  MNTLOC="${CDMNT}/components"
-  break
-fi
-umount ${CDMNT}
-
-break
-
-done
-
-# Did we find the CD?
-if [ "${MNTLOC}" = "" ] 
-then
-  # Ask the user if they wish to locate file manually
-  kdialog --yesno "PC-BSD CD #2 could not be found.\n Do you wish to specify the package location manually?"
-  if [ "$?" = "0" ]
-  then
-    LOC=`kdialog --getopenfilename '/home' ${PACKAGE}`
-    LOC2=`kdialog --getopenfilename '/home' ${PACKAGE2}`
-
-     if [ ! -e "${LOC}" ]
-     then
-        kdialog --error "Error: Package not found!"
-     fi
-     
-     if [ ! -e "${LOC2}" ]
-     then
-        kdialog --error "Error: Package not found!"
-     fi
-
-     pkg_add -f ${LOC}
-     if [ "$?" = "0" ]
-     then
-       exit 0
-     else
-       exit 1
-     fi
-
-  fi
-
-else # End of manual install routine
-
-pkg_add -f ${MNTLOC}/${PACKAGE}
-pkg_add -f ${MNTLOC}/${PACKAGE2}
-if [ "$?" = "0" ]
-then
-  cd /
-  umount -f ${CDMNT}
-  exit 0
-else
-  cd /
-  umount -f ${CDMNT}
-  exit 1
-fi
-
-fi # End of CD Install routine
+pkg_add -f ${FILEDIR}/${PACKAGE}


Property changes on: pcbsd/trunk/system-overlay/PCBSD/Components/kdesdk/pkg-config.sh
___________________________________________________________________
Added: svn:executable
   + *

Modified: pcbsd/trunk/system-overlay/PCBSD/Components/kdetoys/install.sh
===================================================================
--- pcbsd/trunk/system-overlay/PCBSD/Components/kdetoys/install.sh	2008-08-06 15:31:34 UTC (rev 2536)
+++ pcbsd/trunk/system-overlay/PCBSD/Components/kdetoys/install.sh	2008-08-06 15:39:56 UTC (rev 2537)
@@ -4,93 +4,10 @@
 # Set our variables
 #############################################################################
 
-CDMNT="/tmp/pcbsdcdmnt"
-MNTLOC=""
+FILEDIR="${1}"
 PACKAGE="kdetoys-*.tbz"
 
 # Start install
 #############################################################################
 
-while
-i=1
-do
-
-# Prompt for CD 2
-kdialog --msgbox "Please insert PC-BSD 1.4 CD2 and click OK when ready"
-
-mkdir ${CDMNT}
-mount_cd9660 /dev/cd0 ${CDMNT} >/dev/null 2>/dev/null
-if [ -e "${CDMNT}/README-PBI.txt" ]
-then
-  MNTLOC="${CDMNT}/components"
-  break
-fi
-umount ${CDMNT}
-
-mount_cd9660 /dev/cd1 ${CDMNT} >/dev/null 2>/dev/null
-if [ -e "${CDMNT}/README-PBI.txt" ]
-then
-  MNTLOC="${CDMNT}/components"
-  break
-fi
-umount ${CDMNT}
-
-mount_cd9660 /dev/acd0 ${CDMNT} >/dev/null 2>/dev/null
-if [ -e "${CDMNT}/README-PBI.txt" ]
-then
-  MNTLOC="${CDMNT}/components"
-  break
-fi
-umount ${CDMNT}
-
-mount_cd9660 /dev/acd1 ${CDMNT} >/dev/null 2>/dev/null
-if [ -e "${CDMNT}/README-PBI.txt" ]
-then
-  MNTLOC="${CDMNT}/components"
-  break
-fi
-umount ${CDMNT}
-
-break
-
-done
-
-# Did we find the CD?
-if [ "${MNTLOC}" = "" ] 
-then
-  # Ask the user if they wish to locate file manually
-  kdialog --yesno "PC-BSD CD #2 could not be found.\n Do you wish to specify the package location manually?"
-  if [ "$?" = "0" ]
-  then
-    LOC=`kdialog --getopenfilename '/home' ${PACKAGE}`
-
-     if [ ! -e "${LOC}" ]
-     then
-        kdialog --error "Error: Package not found!"
-     fi
-
-     pkg_add -f ${LOC}
-     if [ "$?" = "0" ]
-     then
-       exit 0
-     else
-       exit 1
-     fi
-
-  fi
-
-else # End of manual install routine
-
-pkg_add -f ${MNTLOC}/${PACKAGE}
-if [ "$?" = "0" ]
-then
-  cd /
-  umount -f ${CDMNT}
-  exit 0
-else
-  cd /
-  umount -f ${CDMNT}
-  exit 1
-fi
-
-fi # End of CD Install routine
+pkg_add -f ${FILEDIR}/${PACKAGE}


Property changes on: pcbsd/trunk/system-overlay/PCBSD/Components/kdetoys/pkg-config.sh
___________________________________________________________________
Added: svn:executable
   + *

Modified: pcbsd/trunk/system-overlay/PCBSD/Components/ports/install.sh
===================================================================
--- pcbsd/trunk/system-overlay/PCBSD/Components/ports/install.sh	2008-08-06 15:31:34 UTC (rev 2536)
+++ pcbsd/trunk/system-overlay/PCBSD/Components/ports/install.sh	2008-08-06 15:39:56 UTC (rev 2537)
@@ -4,97 +4,12 @@
 # Set our variables
 #############################################################################
 
-CDMNT="/tmp/pcbsdcdmnt"
-MNTLOC=""
+FILEDIR="${1}"
 PACKAGE="ports.tbz"
 
 # Start install
 #############################################################################
 
-while
-i=1
-do
-
-# Prompt for CD 2
-kdialog --msgbox "Please insert PC-BSD 1.4 CD2 and click OK when ready"
-
-mkdir ${CDMNT}
-mount_cd9660 /dev/cd0 ${CDMNT} >/dev/null 2>/dev/null
-if [ -e "${CDMNT}/README-PBI.txt" ]
-then
-  MNTLOC="${CDMNT}/components"
-  break
-fi
-umount ${CDMNT}
-
-mount_cd9660 /dev/cd1 ${CDMNT} >/dev/null 2>/dev/null
-if [ -e "${CDMNT}/README-PBI.txt" ]
-then
-  MNTLOC="${CDMNT}/components"
-  break
-fi
-umount ${CDMNT}
-
-mount_cd9660 /dev/acd0 ${CDMNT} >/dev/null 2>/dev/null
-if [ -e "${CDMNT}/README-PBI.txt" ]
-then
-  MNTLOC="${CDMNT}/components"
-  break
-fi
-umount ${CDMNT}
-
-mount_cd9660 /dev/acd1 ${CDMNT} >/dev/null 2>/dev/null
-if [ -e "${CDMNT}/README-PBI.txt" ]
-then
-  MNTLOC="${CDMNT}/components"
-  break
-fi
-umount ${CDMNT}
-
-break
-
-done
-
-# Did we find the CD?
-if [ "${MNTLOC}" = "" ] 
-then
-  # Ask the user if they wish to locate file manually
-  kdialog --yesno "PC-BSD CD #2 could not be found.\n Do you wish to specify the package location manually?"
-  if [ "$?" = "0" ]
-  then
-    LOC=`kdialog --getopenfilename '/home' ${PACKAGE}`
-
-     if [ ! -e "${LOC}" ]
-     then
-        kdialog --error "Error: Package not found!"
-     fi
-
-     mkdir /usr/ports
-     cd /usr/ports
-     tar xvjf ${LOC} 2>/dev/null
-     if [ "$?" = "0" ]
-     then
-       exit 0
-     else
-       exit 1
-     fi
-
-  fi
-
-else # End of manual install routine
-
 mkdir /usr/ports
 cd /usr/ports
-tar xvjf ${MNTLOC}/${PACKAGE} 2>/dev/null
-if [ "$?" = "0" ]
-then
-  cd /
-  umount -f ${CDMNT}
-  exit 0
-else
-  cd /
-  umount -f ${CDMNT}
-  exit 1
-fi
-
-fi # End of CD Install routine
+tar xvjf ${FILEDIR}/${PACKAGE} 2>/dev/null


Property changes on: pcbsd/trunk/system-overlay/PCBSD/Components/ports/pkg-config.sh
___________________________________________________________________
Added: svn:executable
   + *

Modified: pcbsd/trunk/system-overlay/PCBSD/Components/source/install.sh
===================================================================
--- pcbsd/trunk/system-overlay/PCBSD/Components/source/install.sh	2008-08-06 15:31:34 UTC (rev 2536)
+++ pcbsd/trunk/system-overlay/PCBSD/Components/source/install.sh	2008-08-06 15:39:56 UTC (rev 2537)
@@ -4,97 +4,12 @@
 # Set our variables
 #############################################################################
 
-CDMNT="/tmp/pcbsdcdmnt"
-MNTLOC=""
+FILEDIR="${1}"
 PACKAGE="src.tbz"
 
 # Start install
 #############################################################################
 
-while
-i=1
-do
-
-# Prompt for CD 2
-kdialog --msgbox "Please insert PC-BSD CD2 and click OK when ready"
-
-mkdir ${CDMNT}
-mount_cd9660 /dev/cd0 ${CDMNT} >/dev/null 2>/dev/null
-if [ -e "${CDMNT}/README-PBI.txt" ]
-then
-  MNTLOC="${CDMNT}/components"
-  break
-fi
-umount ${CDMNT}
-
-mount_cd9660 /dev/cd1 ${CDMNT} >/dev/null 2>/dev/null
-if [ -e "${CDMNT}/README-PBI.txt" ]
-then
-  MNTLOC="${CDMNT}/components"
-  break
-fi
-umount ${CDMNT}
-
-mount_cd9660 /dev/acd0 ${CDMNT} >/dev/null 2>/dev/null
-if [ -e "${CDMNT}/README-PBI.txt" ]
-then
-  MNTLOC="${CDMNT}/components"
-  break
-fi
-umount ${CDMNT}
-
-mount_cd9660 /dev/acd1 ${CDMNT} >/dev/null 2>/dev/null
-if [ -e "${CDMNT}/README-PBI.txt" ]
-then
-  MNTLOC="${CDMNT}/components"
-  break
-fi
-umount ${CDMNT}
-
-break
-
-done
-
-# Did we find the CD?
-if [ "${MNTLOC}" = "" ] 
-then
-  # Ask the user if they wish to locate file manually
-  kdialog --yesno "PC-BSD CD #2 could not be found.\n Do you wish to specify the package location manually?"
-  if [ "$?" = "0" ]
-  then
-    LOC=`kdialog --getopenfilename '/home' ${PACKAGE}`
-
-     if [ ! -e "${LOC}" ]
-     then
-        kdialog --error "Error: Package not found!"
-     fi
-
-     mkdir /usr/src
-     cd /usr/src
-     tar xvjf ${LOC} 2>/dev/null
-     if [ "$?" = "0" ]
-     then
-       exit 0
-     else
-       exit 1
-     fi
-
-  fi
-
-else # End of manual install routine
-
-mkdir /usr/src
-cd /usr/src
-tar xvjf ${MNTLOC}/${PACKAGE} 2>/dev/null
-if [ "$?" = "0" ]
-then
-  cd /
-  umount -f ${CDMNT}
-  exit 0
-else
-  cd /
-  umount -f ${CDMNT}
-  exit 1
-fi
-
-fi # End of CD Install routine
+mkdir /usr/ports
+cd /usr/ports
+tar xvjf ${FILEDIR}/${PACKAGE} 2>/dev/null


Property changes on: pcbsd/trunk/system-overlay/PCBSD/Components/source/pkg-config.sh
___________________________________________________________________
Added: svn:executable
   + *



More information about the Commits mailing list