Changeset 4a8388e


Ignore:
Timestamp:
09/26/13 07:11:36 (10 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, 9.2-release, releng/10.0, releng/10.0.1, releng/10.0.2
Children:
52ea5dcc
Parents:
e747491 (diff), bee06b9 (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:
6 edited

Legend:

Unmodified
Added
Removed
  • src-sh/de-info/de-profiles/gnome.profile

    r1620346 rbee06b9  
    1818which pc-metapkgmanager >/dev/null 2>/dev/null 
    1919if [ $? -eq 0 ] ; then 
    20   pc-metapkgmanager status GNOME | grep installed >/dev/null 
     20  pc-metapkgmanager status GNOME | grep "is installed" >/dev/null 
    2121  if [ $? -eq 0 ] ; then 
    2222    DE_INSTALLED=1 
  • src-sh/de-info/de-profiles/kde.profile

    r9dbaefd6 rbee06b9  
    2323which pc-metapkgmanager >/dev/null 2>/dev/null 
    2424if [ $? -eq 0 ] ; then 
    25   pc-metapkgmanager status KDE | grep installed >/dev/null 
     25  pc-metapkgmanager status KDE | grep "is installed" >/dev/null 
    2626  if [ $? -eq 0 ] ; then 
    2727    DE_INSTALLED=1 
  • src-sh/de-info/de-profiles/lxde.profile

    r1620346 rbee06b9  
    1919which pc-metapkgmanager >/dev/null 2>/dev/null 
    2020if [ $? -eq 0 ] ; then 
    21   pc-metapkgmanager status LXDE | grep installed >/dev/null 
     21  pc-metapkgmanager status LXDE | grep "is installed" >/dev/null 
    2222  if [ $? -eq 0 ] ; then 
    2323    DE_INSTALLED=1 
  • src-sh/de-info/de-profiles/xfce.profile

    r1620346 rbee06b9  
    2020which pc-metapkgmanager >/dev/null 2>/dev/null 
    2121if [ $? -eq 0 ] ; then 
    22   pc-metapkgmanager status XFCE | grep installed >/dev/null 
     22  pc-metapkgmanager status XFCE | grep "is installed">/dev/null 
    2323  if [ $? -eq 0 ] ; then 
    2424    DE_INSTALLED=1 
  • src-sh/Makefile

    r651bd28 re747491  
    318318        sub-lpreserver-make_default \ 
    319319        sub-pbi-make_default \ 
    320         sub-pbi10-make_default \ 
     320#       sub-pbi10-make_default \ 
    321321        sub-about-make_default \ 
    322322        sub-meta-make_default \ 
     
    341341        sub-lpreserver-make_first \ 
    342342        sub-pbi-make_first \ 
    343         sub-pbi10-make_first \ 
     343#       sub-pbi10-make_first \ 
    344344        sub-about-make_first \ 
    345345        sub-meta-make_first \ 
     
    364364        sub-lpreserver-all \ 
    365365        sub-pbi-all \ 
    366         sub-pbi10-all \ 
     366#       sub-pbi10-all \ 
    367367        sub-about-all \ 
    368368        sub-meta-all \ 
     
    385385 
    386386clean: sub-pbi-clean \ 
    387         sub-pbi10-clean \ 
     387#       sub-pbi10-clean \ 
    388388        sub-libsh-clean \ 
    389389        sub-lpreserver-clean \ 
     
    409409install_subtargets: sub-libsh-install_subtargets \ 
    410410        sub-pbi-install_subtargets \ 
    411         sub-pbi10-install_subtargets \ 
     411#       sub-pbi10-install_subtargets \ 
    412412        sub-lpreserver-install_subtargets \ 
    413413        sub-about-install_subtargets \ 
  • src-sh/pbi-manager/install.sh

    r651bd28 re747491  
    33 
    44# Check if this is for the right version of FreeBSD 
    5 verCheck="`grep '^#define __FreeBSD_version' /usr/include/sys/param.h | awk '{print $3}'`" 
    6 if [ $verCheck -gt 1000000 ] ; then 
    7   # This version is for FreeBSD <= 10 
    8   exit 0 
    9 fi 
     5#verCheck="`grep '^#define __FreeBSD_version' /usr/include/sys/param.h | awk '{print $3}'`" 
     6#if [ $verCheck -gt 1000000 ] ; then 
     7#  # This version is for FreeBSD <= 10 
     8#  exit 0 
     9#fi 
    1010 
    1111DEFAULT="/usr/local" 
Note: See TracChangeset for help on using the changeset viewer.