diff --git a/bin/applyflags b/bin/applyflags index 531c89a..afd3bfe 100755 --- a/bin/applyflags +++ b/bin/applyflags @@ -7,13 +7,13 @@ bindir=$1 # optional to force another OOBUILDDIR in the split build builddir=$2 -if test "z$bindir" == "z"; then +if test "z$bindir" = "z"; then echo "Serious error - requires path to bindir" exit 1 fi cd $bindir -source ./setup >& /dev/null +. ./setup 2>&1 /dev/null SECTIONS="$OOO_ADDITIONAL_SECTIONS" diff --git a/bin/piece/build-generic b/bin/piece/build-generic index e1e1e89..4966093 100755 --- a/bin/piece/build-generic +++ b/bin/piece/build-generic @@ -1,13 +1,13 @@ -#!/bin/bash +#!/bin/sh piece=$1 ooo_build_tag=$2 -source $OO_TOOLSDIR/piece/sys-setup +. $OO_TOOLSDIR/piece/sys-setup custom_env="$OO_TOOLSDIR/piece/env-$piece" if test -f $custom_env; then - source $custom_env + . $custom_env echo "merged custom environment: $custom_env" fi diff --git a/bin/piece/unpack-extras b/bin/piece/unpack-extras index 8baf33e..3758fe5 100755 --- a/bin/piece/unpack-extras +++ b/bin/piece/unpack-extras @@ -1,11 +1,11 @@ -#!/bin/bash +#!/bin/sh TOOLSDIR=$1 OOBUILDDIR=$2 echo "Copying default evolution database into tree" -$GNUCP -f $TOOLSDIR/src/evolocal.odb $OOBUILDDIR/extras/source/database || exit 1; +cp -f $TOOLSDIR/src/evolocal.odb $OOBUILDDIR/extras/source/database || exit 1; echo "Copying custom user-dicts into tree" [ -d $OOBUILDDIR/extras/source/wordbook ] || mkdir -p $OOBUILDDIR/extras/source/wordbook -$GNUCP -f $TOOLSDIR/src/*.dic $OOBUILDDIR/extras/source/wordbook || exit 1; +cp -f $TOOLSDIR/src/*.dic $OOBUILDDIR/extras/source/wordbook || exit 1;