Просмотр исходного кода

Merge branch 'master' into next

* master:
  No need to prefer gawk here
  No need to require gmake here, it will redirect fine via BSDmakefile
  Really no need to require bash here
Bryan Drewery 13 лет назад
Родитель
Сommit
50d4ce0f0c
1 измененных файлов с 6 добавлено и 24 удалено
  1. 6 24
      build.sh

+ 6 - 24
build.sh

@@ -1,26 +1,13 @@
 #! /bin/sh
 #! /bin/sh
-# We want to use BASH, not whatever /bin/sh points to.
-if test -z "$BASH"; then
-  PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-  bash="`which bash`"
-  ${bash} $0 ${1+"$@"}
-  exit 0
-fi
-
 
 
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin:${HOME}/bin
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin:${HOME}/bin
-# Prefer gawk
-AWK="`which awk`"
-if test -z "${AWK}"; then
- AWK="`which gawk`"
-fi
 
 
 if [ -d .git ]; then
 if [ -d .git ]; then
   BUILDTS=$(git log -1 --pretty=format:%ct HEAD)
   BUILDTS=$(git log -1 --pretty=format:%ct HEAD)
   ver=$(git describe)
   ver=$(git describe)
 else
 else
-  ver=$($AWK '/^VERSION/ {print $3}' Makefile.in)
-  BUILDTS=`grep -m 1 "BUILDTS = " Makefile.in | ${AWK} '{print $3}'`
+  ver=$(awk '/^VERSION/ {print $3}' Makefile.in)
+  BUILDTS=`grep -m 1 "BUILDTS = " Makefile.in | awk '{print $3}'`
 fi
 fi
 
 
 # Convert timestamp into readable format
 # Convert timestamp into readable format
@@ -83,7 +70,7 @@ if test -z "$1"; then
 fi
 fi
 
 
 
 
-PACKNAME=`grep "PACKNAME " ${pack} | $AWK '/PACKNAME/ {print $2}'`
+PACKNAME=`grep "PACKNAME " ${pack} | awk '/PACKNAME/ {print $2}'`
 
 
 rm=1
 rm=1
 compile=1
 compile=1
@@ -123,15 +110,10 @@ if [ $compile = "1" ]; then
 
 
  echo "[*] Building ${PACKNAME} for $os"
  echo "[*] Building ${PACKNAME} for $os"
 
 
- MAKE="`which gmake`"
- if test -z "${MAKE}"; then
-  MAKE="`which make`"
- fi
-
  if [ $clean = "2" ]; then
  if [ $clean = "2" ]; then
   if test -f Makefile; then
   if test -f Makefile; then
    echo "[*] DistCleaning old files..."
    echo "[*] DistCleaning old files..."
-   ${MAKE} distclean > /dev/null
+   make distclean > /dev/null
   fi
   fi
  fi
  fi
 
 
@@ -143,7 +125,7 @@ if [ $compile = "1" ]; then
 
 
  if [ $clean = "1" ]; then
  if [ $clean = "1" ]; then
   echo "[*] Cleaning up old binaries/files..."
   echo "[*] Cleaning up old binaries/files..."
-  ${MAKE} clean > /dev/null
+  make clean > /dev/null
  fi
  fi
 fi
 fi
 
 
@@ -151,7 +133,7 @@ _build()
 {
 {
  if [ $compile = "1" ]; then
  if [ $compile = "1" ]; then
   echo "[*] Building ${dmake}${tb}..."
   echo "[*] Building ${dmake}${tb}..."
-  ${MAKE} ${dmake}${tb}
+  make ${dmake}${tb}
   if ! test -f ${tb}; then
   if ! test -f ${tb}; then
     echo "[!] ${dmake}${tb} build failed"
     echo "[!] ${dmake}${tb} build failed"
     exit 1
     exit 1