allow build path spaces in support scripts

- allow build path spaces in configure & support scripts
- use the same die function for all scripts

diff --git a/configure b/configure
index 542ec423d9dca4836b0182952fbc39980adbcc39..84f73154e3f5f4beb32d33c394eb7da90164e2e1 100755 (executable)
--- a/configure
+++ b/configure
@@ -9,7 +9,7 @@
 # Setup
 # ###########################################################################
 
-ROOTDIR=$(cd $(dirname $0); pwd)
+ROOTDIR=$(cd "$(dirname "$0")"; pwd)
 
 #
 # Options
@@ -34,7 +34,7 @@ OPTIONS=(
 # Begin
 #
 
-. $ROOTDIR/support/configure.inc
+. "$ROOTDIR/support/configure.inc"
 parse_args $*
 
 # ###########################################################################
@@ -180,7 +180,7 @@ fi
 #
 if enabled linuxdvb && enabled dvbscan; then
   printf "${TAB}" "fetching dvb-scan files ..."
-  ${ROOTDIR}/support/getmuxlist
+  "${ROOTDIR}/support/getmuxlist"
   if [ $? -ne 0 ]; then
     echo "fail"
     die "Failed to fetch dvb-scan data (use --disable-dvbscan)"
@@ -194,7 +194,7 @@ fi
 
 # Write config
 write_config
-cat >> ${CONFIG_H} <<EOF
+cat >> "${CONFIG_H}" <<EOF
 #define TVHEADEND_DATADIR "$(eval echo ${datadir})/tvheadend"
 EOF
 

diff --git a/support/changelog b/support/changelog
index 3bd008c4678ba778e9b5ee306790e3eec7205ad3..dabd2eaeea1c8f2cfa485c4e3a236ca6b567c0fb 100755 (executable)
--- a/support/changelog
+++ b/support/changelog
@@ -9,18 +9,18 @@ DIST=$2
 VER=$3
 
 # Defaults
-[ -z "$CHANGELOG"     ] && CHANGELOG=$(dirname $0)/../debian/changelog
+[ -z "$CHANGELOG"     ] && CHANGELOG=$(dirname "$0")/../debian/changelog
 [ -z "$DEBEMAIL"      ] && DEBEMAIL="andreas@lonelycoder.com"
 [ -z "$DEBFULLNAME"   ] && DEBFULLNAME="Andreas Öman"
-[ -z "$VER"           ] && VER=$($(dirname $0)/version)
+[ -z "$VER"           ] && VER=$("$(dirname "$0")"/version)
 [ ! -z "$DIST"        ] && VER=${VER}~${DIST}
 [ -z "$DIST"          ] && DIST=unstable
 
 # Output
 NOW=$(date -R)
-echo >${CHANGELOG} "tvheadend (${VER}) ${DIST}; urgency=low"
-echo >>${CHANGELOG}
-echo >>${CHANGELOG} "  * The full changelog can be found at "
-echo >>${CHANGELOG} "    http://www.lonelycoder.com/tvheadend/download"
-echo >>${CHANGELOG}
-echo >>${CHANGELOG} " -- ${DEBFULLNAME} <${DEBEMAIL}>  ${NOW}"
+echo >"${CHANGELOG}"  "tvheadend (${VER}) ${DIST}; urgency=low"
+echo >>"${CHANGELOG}"
+echo >>"${CHANGELOG}" "  * The full changelog can be found at "
+echo >>"${CHANGELOG}" "    http://www.lonelycoder.com/tvheadend/download"
+echo >>"${CHANGELOG}"
+echo >>"${CHANGELOG}" " -- ${DEBFULLNAME} <${DEBEMAIL}>  ${NOW}"

diff --git a/support/configure.inc b/support/configure.inc
old mode 100644 (file)
new mode 100755 (executable)
index f5737f1..9ff2a1e
--- a/support/configure.inc
+++ b/support/configure.inc
@@ -31,7 +31,7 @@ CONFIGURE_ARGS="$*"
 [ -z "$LDFLAGS"  ] && LDFLAGS=
 
 # Environment
-[ -z "$ROOTDIR"  ] && ROOTDIR=$(cd $(dirname $0); pwd)
+[ -z "$ROOTDIR"  ] && ROOTDIR=$(cd "$(dirname "$0")"; pwd)
 [ -z "$BUILDDIR" ] && BUILDDIR=$ROOTDIR/build.$PLATFORM
 [ -z "$TMPDIR"   ] && TMPDIR=/tmp
 
@@ -52,9 +52,10 @@ function toupper
   echo "$@" | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ
 }
 
+# Terminate
 function die
 {
-  [ -z "$1" ] || echo "ERROR: $1"
+  echo >&2 "ERROR: $@"
   exit 1
 }
 
@@ -255,7 +256,7 @@ function check_cc
   cat >$TMPDIR/$$.c <<EOF
 $hdr
 int main() {
- return 0;
+  return 0;
 }
 EOF
   $CC $CFLAGS $LDFLAGS $TMPDIR/$$.c -o $TMPDIR/$$.bin $opt &> /dev/null
@@ -455,12 +456,12 @@ function write_config
   local pkg= opt= k= v=
 
   # Create build directory
-       mkdir -p ${BUILDDIR}
-       BUILDDIR=`cd ${BUILDDIR} && pwd`
+  mkdir -p "${BUILDDIR}"
+  BUILDDIR=`cd "${BUILDDIR}" && pwd`
 
   # Create make include
-       CONFIG_MK=${ROOTDIR}/.config.mk
-  cat > ${CONFIG_MK} <<EOF
+  CONFIG_MK=${ROOTDIR}/.config.mk
+  cat > "${CONFIG_MK}" <<EOF
 # Automatically generated by configure - DO NOT EDIT!
 CONFIGURE_ARGS = ${CONFIGURE_ARGS}
 ROOTDIR  ?= ${ROOTDIR}
@@ -482,14 +483,14 @@ libdir    = ${libdir}
 EOF
 
   # Create C include
-  CONFIG_H=${BUILDDIR}/config.h
-  cat > ${CONFIG_H} <<EOF
+  CONFIG_H="${BUILDDIR}/config.h"
+  cat > "${CONFIG_H}" <<EOF
 // Automatically generated by configure - DO NOT EDIT!
 EOF
 
   # Add package config
   for pkg in ${PACKAGES[*]}; do
-    cat >>${CONFIG_MK} <<EOF
+    cat >>"${CONFIG_MK}" <<EOF
 LDFLAGS += $(pkg-config --libs $pkg)
 CFLAGS  += $(pkg-config --cflags $pkg)
 EOF
@@ -500,18 +501,18 @@ EOF
     k=$(toupper ${row%:*})
     v=${row#*:}
     if [ "$v" == "yes" ]; then
-      cat >>${CONFIG_H} <<EOF
+      cat >>"${CONFIG_H}" <<EOF
 #define ENABLE_${k} 1
 #define CONFIG_${k} 1
 EOF
-      cat >>${CONFIG_MK} <<EOF
+      cat >>"${CONFIG_MK}" <<EOF
 CONFIG_${k} = yes
 EOF
     else
-      cat >>${CONFIG_H} <<EOF
+      cat >>"${CONFIG_H}" <<EOF
 #define ENABLE_${k} 0
 EOF
-      cat >>${CONFIG_MK} <<EOF
+      cat >>"${CONFIG_MK}" <<EOF
 CONFIG_${k} = no
 EOF
     fi

diff --git a/support/getmuxlist b/support/getmuxlist
index eedce8627848b3a9118e18f10f8be55504b1d09f..baa7d6dc1f7be2f258a281ce553c9d0a87a15e25 100755 (executable)
--- a/support/getmuxlist
+++ b/support/getmuxlist
@@ -5,16 +5,16 @@
 
 # Arguments
 DIR=$1
-[ -z "$DIR" ] && DIR=$(dirname $0)/../data/dvb-scan
+[ -z "$DIR" ] && DIR=$(dirname "$0")/../data/dvb-scan
 
 # Update
-if [ -d ${DIR}/.git ]; then
-  (cd ${DIR}; git pull) &> /dev/null
+if [ -d "${DIR}/.git" ]; then
+  (cd "${DIR}"; git pull) &> /dev/null
 
 # Fetch
-elif [ ! -d ${DIR} ]; then
+elif [ ! -d "${DIR}" ]; then
   URL=git://linuxtv.org/dtv-scan-tables.git
-  git clone $URL ${DIR} &> /dev/null
+  git clone $URL "${DIR}" &> /dev/null
 fi
 
 # Note: will not update existing set (if not .git)

diff --git a/support/launchpad-ppa b/support/launchpad-ppa
index ff367d04255398a01cb72cbbbdc08c05c71edf14..bda6c26e6001b03bd2f37e506ccd0e71e9d09417 100755 (executable)
--- a/support/launchpad-ppa
+++ b/support/launchpad-ppa
@@ -8,15 +8,15 @@
 # Terminate
 function die
 {
-  echo $*
+  echo >&2 "ERROR: $@"
   exit 1
 }
 
 # CMD
-CMD=$(basename $0)
+CMD=$(basename "$0")
 
 # Configuration
-TVH_ROOT=$(cd $(dirname $0)/..; pwd)
+TVH_ROOT=$(cd "$(dirname "$0")"/..; pwd)
 [ -z "$TVH_DIST" ] && TVH_DIST="lucid natty oneiric precise quantal"
 [ -z "$TVH_ARCH" ] && TVH_ARCH="i386 amd64"
 
@@ -25,7 +25,7 @@ TVH_ROOT=$(cd $(dirname $0)/..; pwd)
 [ ! -z "$2" ] && PPA=$2 || PPA=unstable
 
 # Setup
-cd $TVH_ROOT || exit 1
+cd "$TVH_ROOT" || exit 1
 NOW=`date -R`
 CHANGELOG=$TVH_ROOT/debian/changelog
 VERFILE=$TVH_ROOT/src/version.c
@@ -35,7 +35,7 @@ git checkout $REL || die "could not checkout $REL"
 git clean -dfx || die "could not clean git tree"
 
 # Create version file
-VER=$($TVH_ROOT/support/version $VERFILE)
+VER=$("$TVH_ROOT/support/version" $VERFILE)
 
 # Fetch scan files
 ./support/getmuxlist || die "failed to fetch dvb-scan files"

diff --git a/support/tarball b/support/tarball
index 2d5b809e145a797f70dc5edc716e56cbfbd398b7..3c3c0886613b637e85aacc6941d3bc68d69d3ce3 100755 (executable)
--- a/support/tarball
+++ b/support/tarball
@@ -3,16 +3,16 @@
 # Build tarball of the current directory
 #
 
-# Exit
+# Terminate
 function die
 {
-  echo "ERROR: $*"
+  echo >&2 "ERROR: $@"
   exit 1
 }
 
 # Switch dir
-SRCDIR=$(dirname $0)/..
-cd $SRCDIR
+SRCDIR=$(dirname "$0")/..
+cd "$SRCDIR"
 
 # Arguments
 REL=$1
@@ -46,8 +46,8 @@ rm -rf $DSTDIR/.gitignore
 $DSTDIR/support/changelog $DSTDIR/debian/changelog "" $VER
 
 # Build tarball
-TARFILE=$(cd $SRCDIR/..; pwd)/tvheadend-$VER1.tar.gz
-tar -C $TMPDIR -zcf $TARFILE tvheadend-$VER1
+TARFILE=$(cd "$SRCDIR"/..; pwd)/tvheadend-$VER1.tar.gz
+tar -C $TMPDIR -zcf "$TARFILE" tvheadend-$VER1
 
 # Done
 echo "Created $TARFILE"

diff --git a/support/version b/support/version
index 68d4fc856446930fae9f3e604c6b6779e5f65a17..f3b37916f1ec94b109c98729863532ead0cc871b 100755 (executable)
--- a/support/version
+++ b/support/version
@@ -8,15 +8,15 @@ FILE=$1
 
 # Calculate version
 if [ -d ".git" ]; then
-    VER=$(cd $(dirname $0)/..; git describe --dirty --match "v*" 2> /dev/null)
-    if [ $? -ne 0 ]; then
-        # Git describe failed, maybe "--dirty" option is not available
-        # Adding "-unknown" postfix to mark this situation
-        VER=$(cd $(dirname $0)/..; git describe --match "v*" 2> /dev/null)-unknown
-    fi
-    VER=$(echo $VER | sed "s/^v//" | sed "s/-\([0-9]*\)-\(g[0-9a-f]*\)/.\1~\2/")
+  VER=$(cd "$(dirname "$0")"/..; git describe --dirty --match "v*" 2> /dev/null)
+  if [ $? -ne 0 ]; then
+    # Git describe failed, maybe "--dirty" option is not available
+    # Adding "-unknown" postfix to mark this situation
+    VER=$(cd "$(dirname "$0")/.."; git describe --match "v*" 2> /dev/null)-unknown
+  fi
+  VER=$(echo $VER | sed "s/^v//" | sed "s/-\([0-9]*\)-\(g[0-9a-f]*\)/.\1~\2/")
 else
-    VER=$(head -1 $(dirname $0)/../debian/changelog | awk '{ print $2 }' | tr -d '()' | cut -d '-' -f 1)
+  VER=$(head -1 "$(dirname "$0")/../debian/changelog" | awk '{ print $2 }' | tr -d '()' | cut -d '-' -f 1)
 fi
 
 # Output
@@ -27,14 +27,14 @@ fi
 
 # Leave (probably ppa build)
 if [ -z "$VER" -a -s "$FILE" ]; then
-  cat $FILE
+  cat "$FILE"
   exit
 fi
 
 # Update?
 NEW_VER="const char *tvheadend_version = \"$VER\";"
-OLD_VER=$(cat $FILE 2> /dev/null)
+OLD_VER=$(cat "$FILE" 2> /dev/null)
 if [ "$NEW_VER" != "$OLD_VER" ]; then
-  echo $NEW_VER > $FILE
+  echo $NEW_VER > "$FILE"
 fi
 echo $VER