Guest User

ShadowKyogre: Spaceman changes I made

a guest
Apr 3rd, 2011
159
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 1.53 KB | None | 0 0
  1. --- spaceman    2010-11-30 06:35:51.000000000 -0800
  2. +++ spaceman.copy   2011-04-03 13:49:19.000000000 -0700
  3. @@ -1039,6 +1039,7 @@
  4.     source $BUILDSCRIPT
  5.  
  6.     for name in ${source[@]} ;  do
  7. +       [ "${name:0:8}" != "https://" ] &&
  8.         [ "${name:0:7}" != "http://" ] &&
  9.         [ "${name:0:6}" != "ftp://" ] && echo ${name} >>$FILELIST
  10.     done
  11. @@ -4145,7 +4146,7 @@
  12.             license makedepends md5sums noextract optdepends
  13.             options pkgdesc pkgname pkgrel pkgname32 pkgrel32 pkgver provides
  14.             replaces section sha1sums sha256sums source url
  15. -           usedesc useflags CC"
  16. +           usedesc useflags CC NOSTRIP PACKAGER"
  17.  
  18.             if [ "${name:0:1}" != "_" ] ; then
  19.                 if ! grep -q -w "$name" <<< "$allowed_vars" ; then
  20. @@ -7860,13 +7861,13 @@
  21.  synonym(){
  22.  # expects a pkgname as $1
  23.  # returns the grep -E string for pkgname and it's synonyms
  24. -syno="$1"
  25. +syno="$(echo $1|sed 's|\([-+]\)|\\|g')" #take out dangerous characters that prevent proper package detection
  26.  [ -z "$DBFILE" ] && DBFILE=$INSTLIST
  27. -syno="${syno} $(grep "^$1:" $DBFILE | cut -d: -f${p_PROVIDES})"
  28. -syn=$(cut -d: -f${p_PROVIDES} $DBFILE | grep -n -E "( |^)$1( |$)" | cut -d: -f${p_PKGNAME})
  29. +syno="${syno} $(grep "^$1:" $DBFILE| cut -d: -f${p_PROVIDES})"
  30. +syn=$(cut -d: -f${p_PROVIDES} $DBFILE| grep -n -E "( |^)$syno( |$)" | cut -d: -f${p_PROVIDES})
  31.  for n in ${syn}
  32.  do
  33. -   syno="${syno} $(sed -n ${n}p $DBFILE | cut -d: -f${p_PKGNAME})"
  34. +    syno="${syno} $(sed -n ${n}p $DBFILE| cut -d: -f${p_PKGNAME})"
  35.  done
  36.  [ $(wc -w <<< "$syno") -gt 1 ] && syno="($(echo $syno | tr " " "|"))"
  37.  echo $syno
Advertisement
Add Comment
Please, Sign In to add comment