Changeset cc22601


Ignore:
Timestamp:
11/28/13 17:10:15 (10 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, releng/10.0, releng/10.0.1, releng/10.0.2, releng/10.0.3
Children:
18e7840
Parents:
471d7d31 (diff), db60a53 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' of github.com:pcbsd/pcbsd

Location:
src-sh
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • src-sh/pc-extractoverlay/ports-overlay/usr/local/bin/xdg-open

    re66bf9e rdb60a53  
    314314  if [ -n "`echo "${UR_PROCS}" | grep startxfce`" ]; then DE=xfce; 
    315315  elif [ -n "`echo "${UR_PROCS}" | grep gnome-session`" ]; then DE=gnome; 
     316  elif [ -n "`echo "${UR_PROCS}" | grep mate-session`" ]; then DE=mate; 
    316317  elif [ -n "`echo "${UR_PROCS}" | grep lxsession`" ]; then DE=lxde; 
    317318  elif [ -n "`echo "${UR_PROCS}" | grep kuiserver`" ]; then DE=kde; 
     
    356357open_kde() 
    357358{ 
    358  
    359     if kioclient -v 2>/dev/null 1>&2; then 
    360         kioclient exec "$1" 
     359    if kde-open -v 2>/dev/null 1>&2; then 
     360        kde-open "$1" 
    361361    else 
    362362        if [ x"$KDE_SESSION_VERSION" = x"4" ]; then 
     
    399399        exit_failure_operation_failed 
    400400    fi 
     401} 
     402 
     403open_mate() 
     404{ 
     405  gvfs-open "$1" 
     406 
     407  if [ $? -eq 0 ]; then 
     408       exit_success 
     409  else 
     410       exit_failure_operation_failed 
     411  fi 
    401412} 
    402413 
     
    558569    ;; 
    559570 
     571    mate) 
     572    open_mate "$url" 
     573    ;; 
     574 
    560575    xfce) 
    561576    open_xfce "$url" 
  • src-sh/pbi-manager10/pbi-manager

    r3359ccf r471d7d31  
    18241824        /etc/rc.d/ldconfig start 
    18251825 
    1826         if [ "$PBI_PKGNGBUILD" ] ; then 
    1827                 echo "Installing pkgng..." 
    1828                 pkgFetchURL=`grep "^packagesite:" /usr/local/etc/pkg.conf | awk '{print $2}' | sed 's|pkg+||g'` 
    1829                 cd /tmp 
    1830                 fetch -o pkg.txz ${pkgFetchURL}/Latest/pkg.txz 
    1831                 if [ $? -ne 0 ] ; then exit_err "Failed fetching pkgng..."; fi 
    1832                 tar xvf pkg.txz >/dev/null 2>/dev/null 
    1833                 ./usr/local/sbin/pkg-static add pkg.txz 
    1834                 if [ $? -ne 0 ] ; then exit_err "Failed installing pkgng..."; fi 
    1835                 rm pkg.txz 
    1836         else 
     1826        if [ -z "$PBI_PKGNGBUILD" ] ; then 
    18371827                echo "Building pkgng..." 
    18381828                cd /usr/ports/ports-mgmt/pkg 
     
    72117201                fi 
    72127202 
     7203                # Install pkgng into the chroot 
     7204                pkg-static -c ${PBI_CHROOTDIR} install -y ports-mgmt/pkg 
     7205                if [ $? -ne 0 ] ; then 
     7206                        exit_err "Failed installing pkgng into chroot" 
     7207                fi 
     7208 
    72137209        fi 
    72147210 
Note: See TracChangeset for help on using the changeset viewer.