[PC-BSD Commits] r5019 - in pcbsd/trunk/pc-sysinstall: . backend backend-query components/amarok components/filezilla components/firefox components/gimp components/k3b components/openoffice components/opera components/pidgin components/ports components/src components/thunderbird components/vlc conf
svn at pcbsd.org
svn at pcbsd.org
Fri Nov 13 11:27:59 PST 2009
Author: kris
Date: 2009-11-13 11:27:59 -0800 (Fri, 13 Nov 2009)
New Revision: 5019
Added:
pcbsd/trunk/pc-sysinstall/backend-query/list-components.sh
Removed:
pcbsd/trunk/pc-sysinstall/components/firefox/component.cfg.be
pcbsd/trunk/pc-sysinstall/components/firefox/component.cfg.ru
pcbsd/trunk/pc-sysinstall/components/firefox/component.cfg.uk
pcbsd/trunk/pc-sysinstall/components/k3b/component.cfg.be
pcbsd/trunk/pc-sysinstall/components/k3b/component.cfg.ru
pcbsd/trunk/pc-sysinstall/components/k3b/component.cfg.uk
pcbsd/trunk/pc-sysinstall/components/openoffice/component.cfg.be
pcbsd/trunk/pc-sysinstall/components/openoffice/component.cfg.ru
pcbsd/trunk/pc-sysinstall/components/openoffice/component.cfg.uk
pcbsd/trunk/pc-sysinstall/components/opera/component.cfg.be
pcbsd/trunk/pc-sysinstall/components/opera/component.cfg.ru
pcbsd/trunk/pc-sysinstall/components/opera/component.cfg.uk
pcbsd/trunk/pc-sysinstall/components/ports/component.cfg.be
pcbsd/trunk/pc-sysinstall/components/ports/component.cfg.ru
pcbsd/trunk/pc-sysinstall/components/ports/component.cfg.uk
pcbsd/trunk/pc-sysinstall/components/src/component.cfg.be
pcbsd/trunk/pc-sysinstall/components/src/component.cfg.ru
pcbsd/trunk/pc-sysinstall/components/src/component.cfg.uk
Modified:
pcbsd/trunk/pc-sysinstall/backend/functions-installcomponents.sh
pcbsd/trunk/pc-sysinstall/components/amarok/component.cfg
pcbsd/trunk/pc-sysinstall/components/amarok/install.sh
pcbsd/trunk/pc-sysinstall/components/filezilla/component.cfg
pcbsd/trunk/pc-sysinstall/components/filezilla/install.sh
pcbsd/trunk/pc-sysinstall/components/firefox/component.cfg
pcbsd/trunk/pc-sysinstall/components/firefox/install.sh
pcbsd/trunk/pc-sysinstall/components/gimp/component.cfg
pcbsd/trunk/pc-sysinstall/components/gimp/install.sh
pcbsd/trunk/pc-sysinstall/components/k3b/component.cfg
pcbsd/trunk/pc-sysinstall/components/k3b/install.sh
pcbsd/trunk/pc-sysinstall/components/openoffice/component.cfg
pcbsd/trunk/pc-sysinstall/components/openoffice/install.sh
pcbsd/trunk/pc-sysinstall/components/opera/component.cfg
pcbsd/trunk/pc-sysinstall/components/opera/install.sh
pcbsd/trunk/pc-sysinstall/components/pidgin/component.cfg
pcbsd/trunk/pc-sysinstall/components/pidgin/install.sh
pcbsd/trunk/pc-sysinstall/components/ports/component.cfg
pcbsd/trunk/pc-sysinstall/components/ports/distfiles
pcbsd/trunk/pc-sysinstall/components/src/component.cfg
pcbsd/trunk/pc-sysinstall/components/src/distfiles
pcbsd/trunk/pc-sysinstall/components/thunderbird/component.cfg
pcbsd/trunk/pc-sysinstall/components/thunderbird/install.sh
pcbsd/trunk/pc-sysinstall/components/vlc/component.cfg
pcbsd/trunk/pc-sysinstall/components/vlc/install.sh
pcbsd/trunk/pc-sysinstall/conf/pc-sysinstall.conf
pcbsd/trunk/pc-sysinstall/pc-sysinstall
pcbsd/trunk/pc-sysinstall/pcinstall.cfg
Log:
Updated pc-sysinstall backend, component installation is working well now, works via network as well,
still need PBIS for 8.0 before we can add distfiles for those components
Also added new query option, list-components which lets our GUI see what
components are available
Modified: pcbsd/trunk/pc-sysinstall/backend/functions-installcomponents.sh
===================================================================
--- pcbsd/trunk/pc-sysinstall/backend/functions-installcomponents.sh 2009-11-13 18:59:49 UTC (rev 5018)
+++ pcbsd/trunk/pc-sysinstall/backend/functions-installcomponents.sh 2009-11-13 19:27:59 UTC (rev 5019)
@@ -10,21 +10,38 @@
FAILED="0"
CFILES=""
+ # Check the type, and set the components subdir properly
+ TYPE="`grep 'type:' ${COMPDIR}/${COMPONENT}/component.cfg | cut -d ' ' -f 2`"
+ if [ "${TYPE}" = "PBI" ]
+ then
+ SUBDIR="PBI"
+ else
+ SUBDIR="components"
+ fi
+
# Lets start by downloading / copying the files this component needs
while read line
do
CFILE="`echo $line | cut -d ':' -f 1`"
CFILEMD5="`echo $line | cut -d ':' -f 2`"
+ CFILE2MD5="`echo $line | cut -d ':' -f 3`"
case ${INSTALLMEDIUM} in
dvd|usb) # On both dvd / usb, we can just copy the file
- cp ${CDMNT}/${COMPFILEDIR}/${CFILE} \
+ cp ${CDMNT}/${COMPFILEDIR}/${SUBDIR}/${CFILE} \
${FSMNT}/${COMPTMPDIR} >>${LOGOUT} 2>>${LOGOUT}
RESULT="$?"
;;
- ftp) curl -o ${FSMNT}/${COMPTMPDIR}/${CFILE} \
- ${NETPATH}/${COMPFILEDIR}/${CFILE} >>${LOGOUT} 2>>${LOGOUT}
+ ftp) get_value_from_cfg ftpPath
+ if [ -z "$VAL" ]
+ then
+ exit_err "ERROR: Install medium was set to ftp, but no ftpPath was provided!"
+ fi
+ FTPPATH="${VAL}"
+
+ curl -o ${FSMNT}/${COMPTMPDIR}/${CFILE} \
+ ${FTPPATH}/${COMPFILEDIR}/${SUBDIR}/${CFILE} 2>&1 | tee -a ${LOGOUT}
RESULT="$?"
;;
esac
@@ -36,7 +53,7 @@
else
# Now lets check the MD5 to confirm the file is valid
CHECKMD5=`md5 -q ${FSMNT}/${COMPTMPDIR}/${CFILE}`
- if [ "${CHECKMD5}" != "${CFILEMD5}" ]
+ if [ "${CHECKMD5}" != "${CFILEMD5}" -a "${CHECKMD5}" != "${CFILE2MD5}" ]
then
echo_log "WARNING: ${CFILE} failed md5 checksum"
FAILED="1"
Property changes on: pcbsd/trunk/pc-sysinstall/backend-query/list-components.sh
___________________________________________________________________
Added: svn:executable
+ *
Modified: pcbsd/trunk/pc-sysinstall/components/amarok/component.cfg
===================================================================
--- pcbsd/trunk/pc-sysinstall/components/amarok/component.cfg 2009-11-13 18:59:49 UTC (rev 5018)
+++ pcbsd/trunk/pc-sysinstall/components/amarok/component.cfg 2009-11-13 19:27:59 UTC (rev 5019)
@@ -1,3 +1,4 @@
# Amarok component file
name: Amarok
description: Music player for KDE
+type: PBI
Modified: pcbsd/trunk/pc-sysinstall/components/amarok/install.sh
===================================================================
--- pcbsd/trunk/pc-sysinstall/components/amarok/install.sh 2009-11-13 18:59:49 UTC (rev 5018)
+++ pcbsd/trunk/pc-sysinstall/components/amarok/install.sh 2009-11-13 19:27:59 UTC (rev 5019)
@@ -3,10 +3,6 @@
DISPLAY=""; export DISPLAY
-LD_ELF_HINTS_PATH="/var/run/ld-pcbsd-elf.so.hints"
-export LD_ELF_HINTS_PATH
-/etc/rc.d/ldconfig-pcbsd start
-
echo "Installing Amarok PBI"
chmod 755 ${COMPTMPDIR}/${CFILE}
${COMPTMPDIR}/${CFILE} -text -accept
Modified: pcbsd/trunk/pc-sysinstall/components/filezilla/component.cfg
===================================================================
--- pcbsd/trunk/pc-sysinstall/components/filezilla/component.cfg 2009-11-13 18:59:49 UTC (rev 5018)
+++ pcbsd/trunk/pc-sysinstall/components/filezilla/component.cfg 2009-11-13 19:27:59 UTC (rev 5019)
@@ -1,3 +1,4 @@
# Filezilla component file
name: FileZilla
description: Powerful FTP, FTPS and SFTP client
+type: PBI
Modified: pcbsd/trunk/pc-sysinstall/components/filezilla/install.sh
===================================================================
--- pcbsd/trunk/pc-sysinstall/components/filezilla/install.sh 2009-11-13 18:59:49 UTC (rev 5018)
+++ pcbsd/trunk/pc-sysinstall/components/filezilla/install.sh 2009-11-13 19:27:59 UTC (rev 5019)
@@ -1,40 +1,8 @@
#!/bin/sh
-# This script installs the FireFox PBI
+# This script installs the PBI
-# Configuration file
-. /usr/local/pcbsd/scripts/PCBSD.Config
-
DISPLAY=""; export DISPLAY
-mkdir -p /mnt/tmp/components
-
-# If we are on a network connection
-if [ -e "/tmp/networkURL" ]
-then
- cd ${FSMNT}/tmp/components
- ${FETCHCMD} ${NETPATH}/PBI/${FILEZILLAPBI}
-else
- cp /cdmnt/PBI/${FILEZILLAPBI} /mnt/tmp/components/
-fi
-
-# Make our install script
-echo '#!/bin/sh
-LD_ELF_HINTS_PATH="/var/run/ld-pcbsd-elf.so.hints"
-export LD_ELF_HINTS_PATH
-/etc/rc.d/ldconfig-pcbsd start
-ls /Programs/Filezilla* >/dev/null 2>/dev/null
-if [ "$?" != "0" ]
-then
- cd /tmp/components/
- chmod 755 *.pbi
- ./*.pbi -text -accept
-fi
-' > /mnt/installComponent.sh
-
-# Run the chrooted script
-chmod 755 /mnt/installComponent.sh
-chroot /mnt /installComponent.sh
-
-rm /mnt/installComponent.sh
-rm -rf /mnt/tmp/components
-
+echo "Installing Filezilla PBI"
+chmod 755 ${COMPTMPDIR}/${CFILE}
+${COMPTMPDIR}/${CFILE} -text -accept
Modified: pcbsd/trunk/pc-sysinstall/components/firefox/component.cfg
===================================================================
--- pcbsd/trunk/pc-sysinstall/components/firefox/component.cfg 2009-11-13 18:59:49 UTC (rev 5018)
+++ pcbsd/trunk/pc-sysinstall/components/firefox/component.cfg 2009-11-13 19:27:59 UTC (rev 5019)
@@ -1,3 +1,4 @@
# Firefox component file
name: Firefox
description: Mozilla's popular web browser
+type: PBI
Modified: pcbsd/trunk/pc-sysinstall/components/firefox/install.sh
===================================================================
--- pcbsd/trunk/pc-sysinstall/components/firefox/install.sh 2009-11-13 18:59:49 UTC (rev 5018)
+++ pcbsd/trunk/pc-sysinstall/components/firefox/install.sh 2009-11-13 19:27:59 UTC (rev 5019)
@@ -1,40 +1,8 @@
#!/bin/sh
-# This script installs the FireFox PBI
+# This script installs the PBI
-# Configuration file
-. /usr/local/pcbsd/scripts/PCBSD.Config
-
DISPLAY=""; export DISPLAY
-mkdir -p /mnt/tmp/components
-
-# If we are on a network connection
-if [ -e "/tmp/networkURL" ]
-then
- cd ${FSMNT}/tmp/components
- ${FETCHCMD} ${NETPATH}/PBI/${FIREFOXPBI}
-else
- cp /cdmnt/PBI/${FIREFOXPBI} /mnt/tmp/components/
-fi
-
-# Make our install script
-echo '#!/bin/sh
-LD_ELF_HINTS_PATH="/var/run/ld-pcbsd-elf.so.hints"
-export LD_ELF_HINTS_PATH
-/etc/rc.d/ldconfig-pcbsd start
-ls /Programs/Firefox* >/dev/null 2>/dev/null
-if [ "$?" != "0" ]
-then
- cd /tmp/components/
- chmod 755 Firefox*
- ./Firefox*.pbi -text -accept
-fi
-' > /mnt/installComponent.sh
-
-# Run the chrooted script
-chmod 755 /mnt/installComponent.sh
-chroot /mnt /installComponent.sh
-
-rm /mnt/installComponent.sh
-rm -rf /mnt/tmp/components
-
+echo "Installing Firefox PBI"
+chmod 755 ${COMPTMPDIR}/${CFILE}
+${COMPTMPDIR}/${CFILE} -text -accept
Modified: pcbsd/trunk/pc-sysinstall/components/gimp/component.cfg
===================================================================
--- pcbsd/trunk/pc-sysinstall/components/gimp/component.cfg 2009-11-13 18:59:49 UTC (rev 5018)
+++ pcbsd/trunk/pc-sysinstall/components/gimp/component.cfg 2009-11-13 19:27:59 UTC (rev 5019)
@@ -1,3 +1,4 @@
# Gimp component file
name: Gimp
description: Powerful photo and image editor
+type: PBI
Modified: pcbsd/trunk/pc-sysinstall/components/gimp/install.sh
===================================================================
--- pcbsd/trunk/pc-sysinstall/components/gimp/install.sh 2009-11-13 18:59:49 UTC (rev 5018)
+++ pcbsd/trunk/pc-sysinstall/components/gimp/install.sh 2009-11-13 19:27:59 UTC (rev 5019)
@@ -1,40 +1,8 @@
#!/bin/sh
-# This script installs the FireFox PBI
+# This script installs the PBI
-# Configuration file
-. /usr/local/pcbsd/scripts/PCBSD.Config
-
DISPLAY=""; export DISPLAY
-mkdir -p /mnt/tmp/components
-
-# If we are on a network connection
-if [ -e "/tmp/networkURL" ]
-then
- cd ${FSMNT}/tmp/components
- ${FETCHCMD} ${NETPATH}/PBI/${GIMPPBI}
-else
- cp /cdmnt/PBI/${GIMPPBI} /mnt/tmp/components/
-fi
-
-# Make our install script
-echo '#!/bin/sh
-LD_ELF_HINTS_PATH="/var/run/ld-pcbsd-elf.so.hints"
-export LD_ELF_HINTS_PATH
-/etc/rc.d/ldconfig-pcbsd start
-ls /Programs/Gimp* >/dev/null 2>/dev/null
-if [ "$?" != "0" ]
-then
- cd /tmp/components/
- chmod 755 *.pbi
- ./*.pbi -text -accept
-fi
-' > /mnt/installComponent.sh
-
-# Run the chrooted script
-chmod 755 /mnt/installComponent.sh
-chroot /mnt /installComponent.sh
-
-rm /mnt/installComponent.sh
-rm -rf /mnt/tmp/components
-
+echo "Installing Gimp PBI"
+chmod 755 ${COMPTMPDIR}/${CFILE}
+${COMPTMPDIR}/${CFILE} -text -accept
Modified: pcbsd/trunk/pc-sysinstall/components/k3b/component.cfg
===================================================================
--- pcbsd/trunk/pc-sysinstall/components/k3b/component.cfg 2009-11-13 18:59:49 UTC (rev 5018)
+++ pcbsd/trunk/pc-sysinstall/components/k3b/component.cfg 2009-11-13 19:27:59 UTC (rev 5019)
@@ -1,3 +1,4 @@
# K3b component file
name: K3B
description: Powerful CD / DVD burning tool
+type: PBI
Modified: pcbsd/trunk/pc-sysinstall/components/k3b/install.sh
===================================================================
--- pcbsd/trunk/pc-sysinstall/components/k3b/install.sh 2009-11-13 18:59:49 UTC (rev 5018)
+++ pcbsd/trunk/pc-sysinstall/components/k3b/install.sh 2009-11-13 19:27:59 UTC (rev 5019)
@@ -1,41 +1,8 @@
#!/bin/sh
-# This script installs the K3B PBI
+# This script installs the PBI
-# Configuration file
-. /usr/local/pcbsd/scripts/PCBSD.Config
-
DISPLAY=""; export DISPLAY
-mkdir -p /mnt/tmp/components
-
-# If we are on a network connection
-if [ -e "/tmp/networkURL" ]
-then
- cd ${FSMNT}/tmp/components
- ${FETCHCMD} ${NETPATH}/PBI/${K3BPBI}
-else
- cp /cdmnt/PBI/${K3BPBI} /mnt/tmp/components/
-fi
-
-
-# Make our install script
-echo '#!/bin/sh
-LD_ELF_HINTS_PATH="/var/run/ld-pcbsd-elf.so.hints"
-export LD_ELF_HINTS_PATH
-/etc/rc.d/ldconfig-pcbsd start
-ls /Programs/K3B* >/dev/null 2>/dev/null
-if [ "$?" != "0" ]
-then
- cd /tmp/components/
- chmod 755 K3B*
- ./K3B*.pbi -text -accept
-fi
-' > /mnt/installComponent.sh
-
-# Run the chrooted script
-chmod 755 /mnt/installComponent.sh
-chroot /mnt /installComponent.sh
-
-rm /mnt/installComponent.sh
-rm -rf /mnt/tmp/components
-
+echo "Installing K3B PBI"
+chmod 755 ${COMPTMPDIR}/${CFILE}
+${COMPTMPDIR}/${CFILE} -text -accept
Modified: pcbsd/trunk/pc-sysinstall/components/openoffice/component.cfg
===================================================================
--- pcbsd/trunk/pc-sysinstall/components/openoffice/component.cfg 2009-11-13 18:59:49 UTC (rev 5018)
+++ pcbsd/trunk/pc-sysinstall/components/openoffice/component.cfg 2009-11-13 19:27:59 UTC (rev 5019)
@@ -1,3 +1,4 @@
# OpenOffice component file
name: OpenOffice.org
description: Full featured office suite
+type: PBI
Modified: pcbsd/trunk/pc-sysinstall/components/openoffice/install.sh
===================================================================
--- pcbsd/trunk/pc-sysinstall/components/openoffice/install.sh 2009-11-13 18:59:49 UTC (rev 5018)
+++ pcbsd/trunk/pc-sysinstall/components/openoffice/install.sh 2009-11-13 19:27:59 UTC (rev 5019)
@@ -1,41 +1,8 @@
#!/bin/sh
-# This script installs the OpenOffice PBI
+# This script installs the PBI
-# Configuration file
-. /usr/local/pcbsd/scripts/PCBSD.Config
-
DISPLAY=""; export DISPLAY
-mkdir -p /mnt/tmp/components
-
-# If we are on a network connection
-if [ -e "/tmp/networkURL" ]
-then
- cd ${FSMNT}/tmp/components
- ${FETCHCMD} ${NETPATH}/PBI/${OPENOFFICEPBI}
-else
- cp /cdmnt/PBI/${OPENOFFICEPBI} /mnt/tmp/components/
-fi
-
-
-# Make our install script
-echo '#!/bin/sh
-LD_ELF_HINTS_PATH="/var/run/ld-pcbsd-elf.so.hints"
-export LD_ELF_HINTS_PATH
-/etc/rc.d/ldconfig-pcbsd start
-ls /Programs/OpenOffice* >/dev/null 2>/dev/null
-if [ "$?" != "0" ]
-then
- cd /tmp/components/
- chmod 755 Open*
- ./OpenOffice*.pbi -text
-fi
-' > /mnt/installComponent.sh
-
-# Run the chrooted script
-chmod 755 /mnt/installComponent.sh
-chroot /mnt /installComponent.sh
-
-rm /mnt/installComponent.sh
-rm -rf /mnt/tmp/components
-
+echo "Installing OpenOffice PBI"
+chmod 755 ${COMPTMPDIR}/${CFILE}
+${COMPTMPDIR}/${CFILE} -text -accept
Modified: pcbsd/trunk/pc-sysinstall/components/opera/component.cfg
===================================================================
--- pcbsd/trunk/pc-sysinstall/components/opera/component.cfg 2009-11-13 18:59:49 UTC (rev 5018)
+++ pcbsd/trunk/pc-sysinstall/components/opera/component.cfg 2009-11-13 19:27:59 UTC (rev 5019)
@@ -1,3 +1,4 @@
# Opera component file
name: Opera
description: Web Browser with BitTorrent client
+type: PBI
Modified: pcbsd/trunk/pc-sysinstall/components/opera/install.sh
===================================================================
--- pcbsd/trunk/pc-sysinstall/components/opera/install.sh 2009-11-13 18:59:49 UTC (rev 5018)
+++ pcbsd/trunk/pc-sysinstall/components/opera/install.sh 2009-11-13 19:27:59 UTC (rev 5019)
@@ -1,40 +1,8 @@
#!/bin/sh
-# This script installs the Opera PBI
+# This script installs the PBI
-# Configuration file
-. /usr/local/pcbsd/scripts/PCBSD.Config
-
DISPLAY=""; export DISPLAY
-mkdir -p /mnt/tmp/components
-
-# If we are on a network connection
-if [ -e "/tmp/networkURL" ]
-then
- cd ${FSMNT}/tmp/components
- ${FETCHCMD} ${NETPATH}/PBI/${OPERAPBI}
-else
- cp /cdmnt/PBI/${OPERAPBI} /mnt/tmp/components/
-fi
-
-# Make our install script
-echo '#!/bin/sh
-LD_ELF_HINTS_PATH="/var/run/ld-pcbsd-elf.so.hints"
-export LD_ELF_HINTS_PATH
-/etc/rc.d/ldconfig-pcbsd start
-ls /Programs/Opera* >/dev/null 2>/dev/null
-if [ "$?" != "0" ]
-then
- cd /tmp/components/
- chmod 755 Opera*
- echo "\n\n\nyes" | ./Opera*.pbi -text
-fi
-' > /mnt/installComponent.sh
-
-# Run the chrooted script
-chmod 755 /mnt/installComponent.sh
-chroot /mnt /installComponent.sh
-
-rm /mnt/installComponent.sh
-rm -rf /mnt/tmp/components
-
+echo "Installing Opera PBI"
+chmod 755 ${COMPTMPDIR}/${CFILE}
+${COMPTMPDIR}/${CFILE} -text -accept
Modified: pcbsd/trunk/pc-sysinstall/components/pidgin/component.cfg
===================================================================
--- pcbsd/trunk/pc-sysinstall/components/pidgin/component.cfg 2009-11-13 18:59:49 UTC (rev 5018)
+++ pcbsd/trunk/pc-sysinstall/components/pidgin/component.cfg 2009-11-13 19:27:59 UTC (rev 5019)
@@ -1,3 +1,4 @@
# Pidgin component file
name: Pidgin
description: Multi-protocol IM Client
+type: PBI
Modified: pcbsd/trunk/pc-sysinstall/components/pidgin/install.sh
===================================================================
--- pcbsd/trunk/pc-sysinstall/components/pidgin/install.sh 2009-11-13 18:59:49 UTC (rev 5018)
+++ pcbsd/trunk/pc-sysinstall/components/pidgin/install.sh 2009-11-13 19:27:59 UTC (rev 5019)
@@ -1,40 +1,8 @@
#!/bin/sh
-# This script installs the FireFox PBI
+# This script installs the PBI
-# Configuration file
-. /usr/local/pcbsd/scripts/PCBSD.Config
-
DISPLAY=""; export DISPLAY
-mkdir -p /mnt/tmp/components
-
-# If we are on a network connection
-if [ -e "/tmp/networkURL" ]
-then
- cd ${FSMNT}/tmp/components
- ${FETCHCMD} ${NETPATH}/PBI/${PIDGINPBI}
-else
- cp /cdmnt/PBI/${PIDGINPBI} /mnt/tmp/components/
-fi
-
-# Make our install script
-echo '#!/bin/sh
-LD_ELF_HINTS_PATH="/var/run/ld-pcbsd-elf.so.hints"
-export LD_ELF_HINTS_PATH
-/etc/rc.d/ldconfig-pcbsd start
-ls /Programs/Pidgin* >/dev/null 2>/dev/null
-if [ "$?" != "0" ]
-then
- cd /tmp/components/
- chmod 755 *.pbi
- ./*.pbi -text -accept
-fi
-' > /mnt/installComponent.sh
-
-# Run the chrooted script
-chmod 755 /mnt/installComponent.sh
-chroot /mnt /installComponent.sh
-
-rm /mnt/installComponent.sh
-rm -rf /mnt/tmp/components
-
+echo "Installing Pidgin PBI"
+chmod 755 ${COMPTMPDIR}/${CFILE}
+${COMPTMPDIR}/${CFILE} -text -accept
Modified: pcbsd/trunk/pc-sysinstall/components/ports/component.cfg
===================================================================
--- pcbsd/trunk/pc-sysinstall/components/ports/component.cfg 2009-11-13 18:59:49 UTC (rev 5018)
+++ pcbsd/trunk/pc-sysinstall/components/ports/component.cfg 2009-11-13 19:27:59 UTC (rev 5019)
@@ -1,3 +1,4 @@
# System Source Component
name: Ports Tree
description: FreeBSD ports collection
+type: component
Modified: pcbsd/trunk/pc-sysinstall/components/ports/distfiles
===================================================================
--- pcbsd/trunk/pc-sysinstall/components/ports/distfiles 2009-11-13 18:59:49 UTC (rev 5018)
+++ pcbsd/trunk/pc-sysinstall/components/ports/distfiles 2009-11-13 19:27:59 UTC (rev 5019)
@@ -1 +1 @@
-ports.tbz:904d8330a1b1a0558a6d06488b7890f0
+ports.tbz:7dcf759f0d920720328ca296f078f02e
Modified: pcbsd/trunk/pc-sysinstall/components/src/component.cfg
===================================================================
--- pcbsd/trunk/pc-sysinstall/components/src/component.cfg 2009-11-13 18:59:49 UTC (rev 5018)
+++ pcbsd/trunk/pc-sysinstall/components/src/component.cfg 2009-11-13 19:27:59 UTC (rev 5019)
@@ -1,3 +1,4 @@
# System Source Component
name: Source Code
description: FreeBSD system source
+type: component
Modified: pcbsd/trunk/pc-sysinstall/components/src/distfiles
===================================================================
--- pcbsd/trunk/pc-sysinstall/components/src/distfiles 2009-11-13 18:59:49 UTC (rev 5018)
+++ pcbsd/trunk/pc-sysinstall/components/src/distfiles 2009-11-13 19:27:59 UTC (rev 5019)
@@ -1 +1 @@
-src.tbz:e62a2e70a162e3fdef7f3e35343f7efb
+src.tbz:5aa6ed2b2d3b99dbb5beea941cca6659
Modified: pcbsd/trunk/pc-sysinstall/components/thunderbird/component.cfg
===================================================================
--- pcbsd/trunk/pc-sysinstall/components/thunderbird/component.cfg 2009-11-13 18:59:49 UTC (rev 5018)
+++ pcbsd/trunk/pc-sysinstall/components/thunderbird/component.cfg 2009-11-13 19:27:59 UTC (rev 5019)
@@ -1,3 +1,4 @@
# Thunderbird component file
name: Thunderbird
description: Mozilla's popular E-mail client
+type: PBI
Modified: pcbsd/trunk/pc-sysinstall/components/thunderbird/install.sh
===================================================================
--- pcbsd/trunk/pc-sysinstall/components/thunderbird/install.sh 2009-11-13 18:59:49 UTC (rev 5018)
+++ pcbsd/trunk/pc-sysinstall/components/thunderbird/install.sh 2009-11-13 19:27:59 UTC (rev 5019)
@@ -1,40 +1,8 @@
#!/bin/sh
-# This script installs the FireFox PBI
+# This script installs the PBI
-# Configuration file
-. /usr/local/pcbsd/scripts/PCBSD.Config
-
DISPLAY=""; export DISPLAY
-mkdir -p /mnt/tmp/components
-
-# If we are on a network connection
-if [ -e "/tmp/networkURL" ]
-then
- cd ${FSMNT}/tmp/components
- ${FETCHCMD} ${NETPATH}/PBI/${THUNDERBIRDPBI}
-else
- cp /cdmnt/PBI/${THUNDERBIRDPBI} /mnt/tmp/components/
-fi
-
-# Make our install script
-echo '#!/bin/sh
-LD_ELF_HINTS_PATH="/var/run/ld-pcbsd-elf.so.hints"
-export LD_ELF_HINTS_PATH
-/etc/rc.d/ldconfig-pcbsd start
-ls /Programs/Thunderbird* >/dev/null 2>/dev/null
-if [ "$?" != "0" ]
-then
- cd /tmp/components/
- chmod 755 *.pbi
- ./*.pbi -text -accept
-fi
-' > /mnt/installComponent.sh
-
-# Run the chrooted script
-chmod 755 /mnt/installComponent.sh
-chroot /mnt /installComponent.sh
-
-rm /mnt/installComponent.sh
-rm -rf /mnt/tmp/components
-
+echo "Installing Thunderbird PBI"
+chmod 755 ${COMPTMPDIR}/${CFILE}
+${COMPTMPDIR}/${CFILE} -text -accept
Modified: pcbsd/trunk/pc-sysinstall/components/vlc/component.cfg
===================================================================
--- pcbsd/trunk/pc-sysinstall/components/vlc/component.cfg 2009-11-13 18:59:49 UTC (rev 5018)
+++ pcbsd/trunk/pc-sysinstall/components/vlc/component.cfg 2009-11-13 19:27:59 UTC (rev 5019)
@@ -1,3 +1,4 @@
# VLC component file
name: VLC
description: Multimedia player with streaming capabilities
+type: PBI
Modified: pcbsd/trunk/pc-sysinstall/components/vlc/install.sh
===================================================================
--- pcbsd/trunk/pc-sysinstall/components/vlc/install.sh 2009-11-13 18:59:49 UTC (rev 5018)
+++ pcbsd/trunk/pc-sysinstall/components/vlc/install.sh 2009-11-13 19:27:59 UTC (rev 5019)
@@ -1,40 +1,8 @@
#!/bin/sh
-# This script installs the FireFox PBI
+# This script installs the PBI
-# Configuration file
-. /usr/local/pcbsd/scripts/PCBSD.Config
-
DISPLAY=""; export DISPLAY
-mkdir -p /mnt/tmp/components
-
-# If we are on a network connection
-if [ -e "/tmp/networkURL" ]
-then
- cd ${FSMNT}/tmp/components
- ${FETCHCMD} ${NETPATH}/PBI/${VLCPBI}
-else
- cp /cdmnt/PBI/${VLCPBI} /mnt/tmp/components/
-fi
-
-# Make our install script
-echo '#!/bin/sh
-LD_ELF_HINTS_PATH="/var/run/ld-pcbsd-elf.so.hints"
-export LD_ELF_HINTS_PATH
-/etc/rc.d/ldconfig-pcbsd start
-ls /Programs/VLC* >/dev/null 2>/dev/null
-if [ "$?" != "0" ]
-then
- cd /tmp/components/
- chmod 755 *.pbi
- ./*.pbi -text -accept
-fi
-' > /mnt/installComponent.sh
-
-# Run the chrooted script
-chmod 755 /mnt/installComponent.sh
-chroot /mnt /installComponent.sh
-
-rm /mnt/installComponent.sh
-rm -rf /mnt/tmp/components
-
+echo "Installing VLC PBI"
+chmod 755 ${COMPTMPDIR}/${CFILE}
+${COMPTMPDIR}/${CFILE} -text -accept
Modified: pcbsd/trunk/pc-sysinstall/conf/pc-sysinstall.conf
===================================================================
--- pcbsd/trunk/pc-sysinstall/conf/pc-sysinstall.conf 2009-11-13 18:59:49 UTC (rev 5018)
+++ pcbsd/trunk/pc-sysinstall/conf/pc-sysinstall.conf 2009-11-13 19:27:59 UTC (rev 5019)
@@ -42,7 +42,7 @@
# Set the location of component files on DVD / usb / ftp
# Relative to CDMNT or the FTP root
-COMPFILEDIR="components/"
+COMPFILEDIR="extras/"
export COMPFILEDIR
# Set the component temp directory, which is relative to FSMNT
Modified: pcbsd/trunk/pc-sysinstall/pc-sysinstall
===================================================================
--- pcbsd/trunk/pc-sysinstall/pc-sysinstall 2009-11-13 18:59:49 UTC (rev 5018)
+++ pcbsd/trunk/pc-sysinstall/pc-sysinstall 2009-11-13 19:27:59 UTC (rev 5019)
@@ -138,6 +138,10 @@
# Function which lists available backups on a rsync/ssh server
list-rsync-backups) ${QUERYDIR}/list-rsync-backups.sh "${2}" "${3}" "${4}"
;;
+
+ # Function which lists components available
+ list-components) ${QUERYDIR}/list-components.sh
+ ;;
*) echo "Unknown Command: ${1}"
exit 1 ;;
Modified: pcbsd/trunk/pc-sysinstall/pcinstall.cfg
===================================================================
--- pcbsd/trunk/pc-sysinstall/pcinstall.cfg 2009-11-13 18:59:49 UTC (rev 5018)
+++ pcbsd/trunk/pc-sysinstall/pcinstall.cfg 2009-11-13 19:27:59 UTC (rev 5019)
@@ -44,10 +44,10 @@
#packageType=uzip
packageType=tar
-#installComponents=ports,src
commitInstall
-#autoLoginUser=kris
+installComponents=ports,src
+autoLoginUser=kris
# Set the root pass
rootPass=root
More information about the Commits
mailing list