Changeset 9b2e2e6


Ignore:
Timestamp:
Nov 26, 2013 8:31:08 AM (5 months ago)
Author:
Kris Moore <kris@…>
Branches:
9.2-release
Children:
8985cde
Parents:
cfad5bc
Message:

Backport to 9.2 the fixes for pkg+http:// in pkg.conf

Location:
src-sh
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • src-sh/libsh/functions.sh

    ra6c8b4a r9b2e2e6  
    4949     exit_err "Failed getting packagesite:" 
    5050  fi 
    51   pkgUrl="`grep '^packagesite:' /usr/local/etc/pkg.conf | awk '{print $2}'`" 
     51  pkgUrl="`grep '^packagesite:' /usr/local/etc/pkg.conf | awk '{print $2}' | sed 's|pkg+||g'`" 
    5252 
    5353  if [ ! -d "$PKG_CACHEDIR/All" ] ; then 
  • src-sh/pbi-manager10/pbi-manager

    ra6c8b4a r9b2e2e6  
    17891789        if [ "$PBI_PKGNGBUILD" ] ; then 
    17901790                echo "Installing pkgng..." 
    1791                 pkgFetchURL=`grep "^packagesite:" /usr/local/etc/pkg.conf | awk '{print $2}'` 
     1791                pkgFetchURL=`grep "^packagesite:" /usr/local/etc/pkg.conf | awk '{print $2}' | sed 's|pkg+||g'` 
    17921792                cd /tmp 
    17931793                fetch -o pkg.txz ${pkgFetchURL}/Latest/pkg.txz 
  • src-sh/pc-updatemanager/pc-updatemanager

    r8506d7a2 r9b2e2e6  
    423423  # Set the new pkg.conf file to the new repo 
    424424  local arch=`uname -m` 
    425   echo "packagesite: http://pkg.cdn.pcbsd.org/$rel/$arch" >/usr/local/etc/pkg.conf 
     425  echo "packagesite: pkg+http://pkg.cdn.pcbsd.org/$rel/$arch" >/usr/local/etc/pkg.conf 
    426426  echo "PUBKEY: /usr/local/etc/pkg-pubkey.cert" >>/usr/local/etc/pkg.conf 
    427427  echo "PKG_CACHEDIR: /usr/local/tmp" >>/usr/local/etc/pkg.conf 
  • src-sh/warden/scripts/backend/functions.sh

    re5240d6 r9b2e2e6  
    800800rm pkg.txz 
    801801 
    802 echo "packagesite: http://pkg.cdn.pcbsd.org/${release}/${arch}" >/usr/local/etc/pkg.conf 
     802echo "packagesite: pkg+http://pkg.cdn.pcbsd.org/${release}/${arch}" >/usr/local/etc/pkg.conf 
    803803echo "PUBKEY: /usr/local/etc/pkg-pubkey.cert" >>/usr/local/etc/pkg.conf 
    804804echo "PKG_CACHEDIR: /usr/local/tmp" >>/usr/local/etc/pkg.conf 
     
    833833mount -t devfs devfs /dev 
    834834 
    835 echo "packagesite: http://pkg.cdn.pcbsd.org/${release}/${arch}" >/usr/local/etc/pkg.conf 
     835echo "packagesite: pkg+http://pkg.cdn.pcbsd.org/${release}/${arch}" >/usr/local/etc/pkg.conf 
    836836echo "PUBKEY: /usr/local/etc/pkg-pubkey.cert" >>/usr/local/etc/pkg.conf 
    837837echo "PKG_CACHEDIR: /usr/local/tmp" >>/usr/local/etc/pkg.conf 
Note: See TracChangeset for help on using the changeset viewer.