Changeset 189b2c1


Ignore:
Timestamp:
07/03/14 08:18:11 (11 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, enter/10, releng/10.0.3, releng/10.1, releng/10.1.1, releng/10.1.2
Children:
ceb4257
Parents:
234414e (diff), 4d7a2d5 (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

Files:
5 added
6 edited

Legend:

Unmodified
Added
Removed
  • pbi-modules/cad/geda/pbi.conf

    r8374584 r4d7a2d5  
    11#!/bin/sh 
    2 # PBING Module Config 
     2# 10.x (5/21/14) PBING Build Configuration 
     3# Generated using EasyPBI 
    34 
    4 # -- Program Base Information -- 
    5 PBI_ORIGIN="cad/geda" 
    65PBI_PROGNAME="gEDA" 
    7 PBI_PROGWEB="" 
    86PBI_PROGAUTHOR="gEDA Team" 
    9  
    10 # -- Additional repo information (optional) -- 
    11 PBI_LICENSE="" 
    127PBI_TAGS="Electronics,CAD,hardware,design" 
    138PBI_PROGTYPE="Graphical" 
    14 PBI_CATEGORY="CAD" 
    15  
    16 # -- Additional package to install along with ORIGIN 
     9PBI_ORIGIN="cad/geda" 
    1710PBI_OTHERPKGS="" 
    18  
    19 # -- Optional related packages to show user 
    2011PBI_PLUGINS="" 
    21  
    22  
    23  
    24 # -- Space delimited list of URLs to screenshots 
    25 PBI_SCREENSHOTS="" 
    26  
    27 # -- Other PBIs which are similar to this PBI 
     12PBI_SCREENSHOTS="http://www.pcbsd.org/appcafe/screenshots/cad/geda/screen1.png" 
    2813PBI_RELATED="" 
    2914 
    30 export PBI_ORIGIN PBI_PROGNAME PBI_PROGWEB PBI_PROGAUTHOR 
    31 export PBI_LICENSE PBI_TAGS PBI_PROGTYPE PBI_CATEGORY 
    32 export PBI_OTHERPKGS PBI_PLUGINS 
    33 export PBI_SCREENSHOTS PBI_RELATED 
    34  
     15export PBI_PROGNAME PBI_PROGAUTHOR PBI_TAGS PBI_PROGTYPE PBI_ORIGIN PBI_OTHERPKGS PBI_PLUGINS PBI_SCREENSHOTS PBI_RELATED 
  • pbi-modules/cad/leocad/pbi.conf

    r8374584 r4d7a2d5  
    11#!/bin/sh 
    2 # PBING Module Config 
     2# 10.x (5/21/14) PBING Build Configuration 
     3# Generated using EasyPBI 
    34 
    4 # -- Program Base Information -- 
    5 PBI_ORIGIN="cad/leocad" 
    65PBI_PROGNAME="LeoCAD" 
    7 PBI_PROGWEB="" 
    86PBI_PROGAUTHOR="LeoCAD Team" 
    9  
    10 # -- Additional repo information (optional) -- 
    11 PBI_LICENSE="" 
    127PBI_TAGS="cad,lego,brick,ldraw" 
    138PBI_PROGTYPE="Graphical" 
    14 PBI_CATEGORY="CAD" 
    15  
    16 # -- Additional package to install along with ORIGIN 
     9PBI_ORIGIN="cad/leocad" 
    1710PBI_OTHERPKGS="" 
    18  
    19 # -- Optional related packages to show user 
    2011PBI_PLUGINS="" 
    21  
    22  
    23  
    24 # -- Space delimited list of URLs to screenshots 
    25 PBI_SCREENSHOTS="" 
    26  
    27 # -- Other PBIs which are similar to this PBI 
     12PBI_SCREENSHOTS="http://www.pcbsd.org/appcafe/screenshots/cad/leocad/screen1.png" 
    2813PBI_RELATED="" 
    2914 
    30 export PBI_ORIGIN PBI_PROGNAME PBI_PROGWEB PBI_PROGAUTHOR 
    31 export PBI_LICENSE PBI_TAGS PBI_PROGTYPE PBI_CATEGORY 
    32 export PBI_OTHERPKGS PBI_PLUGINS 
    33 export PBI_SCREENSHOTS PBI_RELATED 
    34  
     15export PBI_PROGNAME PBI_PROGAUTHOR PBI_TAGS PBI_PROGTYPE PBI_ORIGIN PBI_OTHERPKGS PBI_PLUGINS PBI_SCREENSHOTS PBI_RELATED 
  • pbi-modules/cad/librecad/pbi.conf

    r8374584 r4d7a2d5  
    11#!/bin/sh 
    2 # PBING Module Config 
     2# 10.x (5/21/14) PBING Build Configuration 
     3# Generated using EasyPBI 
    34 
    4 # -- Program Base Information -- 
    5 PBI_ORIGIN="cad/librecad" 
    65PBI_PROGNAME="LibreCAD" 
    7 PBI_PROGWEB="" 
    86PBI_PROGAUTHOR="LibreCAD Team" 
    9  
    10 # -- Additional repo information (optional) -- 
    117PBI_LICENSE="GPL" 
    128PBI_TAGS="CAD,design,2D" 
    139PBI_PROGTYPE="Graphical" 
    14 PBI_CATEGORY="CAD" 
    15  
    16 # -- Additional package to install along with ORIGIN 
     10PBI_ORIGIN="cad/librecad" 
    1711PBI_OTHERPKGS="" 
    18  
    19 # -- Optional related packages to show user 
    2012PBI_PLUGINS="" 
    21  
    22  
    23  
    24 # -- Space delimited list of URLs to screenshots 
    25 PBI_SCREENSHOTS="" 
    26  
    27 # -- Other PBIs which are similar to this PBI 
     13PBI_SCREENSHOTS="http://www.pcbsd.org/appcafe/screenshots/cad/librecad/screen1.png http://www.pcbsd.org/appcafe/screenshots/cad/librecad/screen2.png" 
    2814PBI_RELATED="" 
    2915 
    30 export PBI_ORIGIN PBI_PROGNAME PBI_PROGWEB PBI_PROGAUTHOR 
    31 export PBI_LICENSE PBI_TAGS PBI_PROGTYPE PBI_CATEGORY 
    32 export PBI_OTHERPKGS PBI_PLUGINS 
    33 export PBI_SCREENSHOTS PBI_RELATED 
    34  
     16export PBI_PROGNAME PBI_PROGAUTHOR PBI_LICENSE PBI_TAGS PBI_PROGTYPE PBI_ORIGIN PBI_OTHERPKGS PBI_PLUGINS PBI_SCREENSHOTS PBI_RELATED 
  • pbi-modules/cad/qcad/pbi.conf

    r8374584 r4d7a2d5  
    11#!/bin/sh 
    2 # PBING Module Config 
     2# 10.x (5/21/14) PBING Build Configuration 
     3# Generated using EasyPBI 
    34 
    4 # -- Program Base Information -- 
    5 PBI_ORIGIN="cad/qcad" 
    65PBI_PROGNAME="Qcad" 
    7 PBI_PROGWEB="" 
    86PBI_PROGAUTHOR="Qcad Team" 
    9  
    10 # -- Additional repo information (optional) -- 
    11 PBI_LICENSE="" 
    127PBI_TAGS="mesh,2D,CAD" 
    138PBI_PROGTYPE="Graphical" 
    14 PBI_CATEGORY="CAD" 
    15  
    16 # -- Additional package to install along with ORIGIN 
     9PBI_ORIGIN="cad/qcad" 
    1710PBI_OTHERPKGS="" 
    18  
    19 # -- Optional related packages to show user 
    2011PBI_PLUGINS="" 
    21  
    22  
    23  
    24 # -- Space delimited list of URLs to screenshots 
    25 PBI_SCREENSHOTS="" 
    26  
    27 # -- Other PBIs which are similar to this PBI 
     12PBI_SCREENSHOTS="http://www.pcbsd.org/appcafe/screenshots/cad/qcad/screen1.png" 
    2813PBI_RELATED="" 
    2914 
    30 export PBI_ORIGIN PBI_PROGNAME PBI_PROGWEB PBI_PROGAUTHOR 
    31 export PBI_LICENSE PBI_TAGS PBI_PROGTYPE PBI_CATEGORY 
    32 export PBI_OTHERPKGS PBI_PLUGINS 
    33 export PBI_SCREENSHOTS PBI_RELATED 
    34  
     15export PBI_PROGNAME PBI_PROGAUTHOR PBI_TAGS PBI_PROGTYPE PBI_ORIGIN PBI_OTHERPKGS PBI_PLUGINS PBI_SCREENSHOTS PBI_RELATED 
  • pbi-modules/cad/qucs/pbi.conf

    r8374584 r4d7a2d5  
    11#!/bin/sh 
    2 # PBING Module Config 
     2# 10.x (5/21/14) PBING Build Configuration 
     3# Generated using EasyPBI 
    34 
    4 # -- Program Base Information -- 
    5 PBI_ORIGIN="cad/qucs" 
    65PBI_PROGNAME="Qucs" 
    76PBI_PROGWEB="http://qucs.sourceforge.net/" 
    87PBI_PROGAUTHOR="Qucs Team" 
    9  
    10 # -- Additional repo information (optional) -- 
    118PBI_LICENSE="GPL" 
    129PBI_TAGS="cad,circuit,design" 
    1310PBI_PROGTYPE="Graphical" 
    14 PBI_CATEGORY="CAD" 
    15  
    16 # -- Additional package to install along with ORIGIN 
     11PBI_ORIGIN="cad/qucs" 
    1712PBI_OTHERPKGS="" 
    18  
    19 # -- Optional related packages to show user 
    2013PBI_PLUGINS="" 
    21  
    22  
    23  
    24 # -- Space delimited list of URLs to screenshots 
    2514PBI_SCREENSHOTS="" 
    26  
    27 # -- Other PBIs which are similar to this PBI 
    2815PBI_RELATED="" 
    2916 
    30 export PBI_ORIGIN PBI_PROGNAME PBI_PROGWEB PBI_PROGAUTHOR 
    31 export PBI_LICENSE PBI_TAGS PBI_PROGTYPE PBI_CATEGORY 
    32 export PBI_OTHERPKGS PBI_PLUGINS 
    33 export PBI_SCREENSHOTS PBI_RELATED 
    34  
     17export PBI_PROGNAME PBI_PROGWEB PBI_PROGAUTHOR PBI_LICENSE PBI_TAGS PBI_PROGTYPE PBI_ORIGIN PBI_OTHERPKGS PBI_PLUGINS PBI_SCREENSHOTS PBI_RELATED 
  • src-sh/libsh/functions.sh

    rf671ad3 r234414e  
    720720  local realName="" 
    721721 
    722   while read line 
    723   do 
    724     echo "$line" | grep -q " Name: " 
     722  while read uline 
     723  do 
     724    echo "$uline" | grep -q " Name: " 
    725725    if [ $? -eq 0 ]; then 
    726       realName="`echo $line | awk '{print $3}'`" 
     726      realName="`echo $uline | awk '{print $3}'`" 
    727727      continue 
    728728    fi 
    729729 
    730     echo "$line" | grep -q "rawuuid: $needle" 
     730    echo "$uline" | grep -q "rawuuid: $needle" 
    731731    if [ $? -eq 0 ]; then 
    732732       echo "$realName" 
     
    774774  zpool status $TANK > /tmp/.zpStatus.$$ 
    775775 
    776   while read line 
     776  restampDisks="" 
     777 
     778  while read zline 
    777779  do 
    778780     # If we have reached cache / log devices, we can break now 
    779      echo $line | grep -q " cache " 
     781     echo $zline | grep -q " cache " 
    780782     if [ $? -eq 0 ] ; then break ; fi 
    781      echo $line | grep -q " log " 
     783     echo $zline | grep -q " log " 
    782784     if [ $? -eq 0 ] ; then break ; fi 
    783785 
    784786     # Only try to stamp disks marked as online 
    785      echo $line | grep -q "ONLINE" 
     787     echo $zline | grep -q "state: " 
     788     if [ $? -eq 0 ] ; then continue ; fi 
     789     echo $zline | grep -q "ONLINE" 
    786790     if [ $? -ne 0 ] ; then continue ; fi 
    787791 
    788792     # Get the disk name 
    789      disk="`echo $line | awk '{print $1}'`" 
     793     disk="`echo $zline | awk '{print $1}'`" 
    790794 
    791795     # Is this a legit disk? 
    792      if [ ! -e "/dev/${disk}" ] ; then 
    793         echo "Warning: No such disk device /dev/${disk}" 
    794         continue 
    795      fi 
     796     if [ ! -e "/dev/${disk}" ] ; then continue; fi 
     797 
     798     restampDisks="$restampDisks $disk" 
     799  done < /tmp/.zpStatus.$$ 
     800  rm /tmp/.zpStatus.$$ 
     801 
     802  for i in $restampDisks 
     803  do 
     804     disk="$i" 
    796805 
    797806     # If this is a GPTID / rawuuid, find out 
     
    816825     echo "Installing GRUB to $disk" >&2 
    817826     grub-install /dev/${disk} 
    818   done < /tmp/.zpStatus.$$ 
    819   rm /tmp/.zpStatus.$$ 
     827  done 
    820828  return 0 
    821829} 
Note: See TracChangeset for help on using the changeset viewer.