[PC-BSD Commits] r19934 - in pcbsd/current/src-sh: pc-thinclient pc-updatemanager

[svn at pcbsd.org]

Author: kris
Date: 2012-10-25 18:37:37 +0000 (Thu, 25 Oct 2012)
New Revision: 19934

Modified:
   pcbsd/current/src-sh/pc-thinclient/pc-thinclient
   pcbsd/current/src-sh/pc-updatemanager/pc-updatemanager
Log:

Fix to use get_mirror 



Modified: pcbsd/current/src-sh/pc-thinclient/pc-thinclient
===================================================================
--- pcbsd/current/src-sh/pc-thinclient/pc-thinclient	2012-10-25 18:37:34 UTC (rev 19933)
+++ pcbsd/current/src-sh/pc-thinclient/pc-thinclient	2012-10-25 18:37:37 UTC (rev 19934)
@@ -244,7 +244,8 @@
   PCBSD_ETCCONF="/usr/local/etc/pcbsd.conf"
 
   # Set the mirror URL
-  MIRRORURL="`cat ${PCBSD_ETCCONF} | grep 'PCBSD_MIRROR: ' | sed 's|PCBSD_MIRROR:||g' | tr -d ' '`"
+  get_mirror
+  MIRRORURL="$VAL"
 
   # Set the system arch type
   if [ "$SYSTYPE" = "desktop" ] ; then

Modified: pcbsd/current/src-sh/pc-updatemanager/pc-updatemanager
===================================================================
--- pcbsd/current/src-sh/pc-updatemanager/pc-updatemanager	2012-10-25 18:37:34 UTC (rev 19933)
+++ pcbsd/current/src-sh/pc-updatemanager/pc-updatemanager	2012-10-25 18:37:37 UTC (rev 19934)
@@ -41,7 +41,8 @@
 if [ ! -d "${DOWNLOADDIR}" ]; then mkdir -p ${DOWNLOADDIR}; fi
 
 # Set the mirror URL
-MIRRORURL="`cat ${PCBSD_ETCCONF} | grep 'PCBSD_MIRROR: ' | sed 's|PCBSD_MIRROR: ||g'`"
+get_mirror
+MIRRORURL="$VAL"
 
 # Trigger File for Tray Application
 TRIGGERFILE="/tmp/.sysupdatetraytrigger"