diff options
-rwxr-xr-x | fetch_tarballs.sh | 8 | ||||
-rwxr-xr-x | odk/pack/copying/addsym-macosx.sh | 2 | ||||
-rwxr-xr-x | sal/qa/helper/gcov/gcov_all | 2 | ||||
-rwxr-xr-x | sal/qa/helper/gcov/statistics | 2 | ||||
-rw-r--r-- | setup_native/scripts/deregister_extensions | 2 | ||||
-rw-r--r-- | setup_native/scripts/install_solaris.sh | 2 | ||||
-rw-r--r-- | setup_native/scripts/mac_install.script | 4 | ||||
-rw-r--r-- | setup_native/scripts/register_extensions | 2 | ||||
-rw-r--r-- | setup_native/scripts/uninstall_solaris.sh | 2 | ||||
-rw-r--r-- | setup_native/tests/opensolaris/bundledextensions/send_ooo | 2 | ||||
-rw-r--r-- | slideshow/qa/debug/colors.sh | 4 | ||||
-rw-r--r-- | slideshow/qa/debug/nodetree.sh | 2 | ||||
-rwxr-xr-x | solenv/bin/addsym-macosx.sh | 2 | ||||
-rw-r--r-- | soltools/testhxx/create.pl | 2 | ||||
-rw-r--r-- | sysui/desktop/share/makefile.mk | 2 | ||||
-rwxr-xr-x | testautomation/tools/run_tests/run_tests.sh | 4 | ||||
-rw-r--r-- | toolkit/src2xml/dryrunall.sh | 2 | ||||
-rw-r--r-- | toolkit/src2xml/sc.sh | 2 | ||||
-rw-r--r-- | toolkit/src2xml/sd.sh | 2 | ||||
-rw-r--r-- | toolkit/src2xml/sw.sh | 2 | ||||
-rwxr-xr-x | writerfilter/source/doctok/cleanupresources | 2 | ||||
-rw-r--r-- | writerfilter/source/ooxml/status.sh | 2 |
22 files changed, 28 insertions, 28 deletions
diff --git a/fetch_tarballs.sh b/fetch_tarballs.sh index 032c39a37f68..d1fb0b34ba44 100755 --- a/fetch_tarballs.sh +++ b/fetch_tarballs.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/sh #************************************************************** # # Licensed to the Apache Software Foundation (ASF) under one @@ -117,7 +117,7 @@ mkdir -p $TARFILE_LOCATION/tmp cd $TARFILE_LOCATION/tmp -function basename () +basename () { echo $1 | sed "s/^\(.*\/\)//" } @@ -126,7 +126,7 @@ function basename () # # Download a file from a URL and add its md5 checksum to its name. # -function download () +download () { local URL=$1 @@ -155,7 +155,7 @@ function download () # # Download a file from a URL and check its md5 sum to the one that is part of its name. # -function download_and_check () +download_and_check () { local URL=$1 diff --git a/odk/pack/copying/addsym-macosx.sh b/odk/pack/copying/addsym-macosx.sh index d3bac6e5e878..ef785d1c9ce2 100755 --- a/odk/pack/copying/addsym-macosx.sh +++ b/odk/pack/copying/addsym-macosx.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # This script is needed in the process of generating exported # symbols list on Mac OS X diff --git a/sal/qa/helper/gcov/gcov_all b/sal/qa/helper/gcov/gcov_all index dad1f736c688..fa098f3bbea4 100755 --- a/sal/qa/helper/gcov/gcov_all +++ b/sal/qa/helper/gcov/gcov_all @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # $Id: gcov_all,v 1.4 2005-11-02 17:23:43 kz Exp $ # This helper run lists all c and cxx files from selected directories. diff --git a/sal/qa/helper/gcov/statistics b/sal/qa/helper/gcov/statistics index cbb374c172d2..a1b43b5524f1 100755 --- a/sal/qa/helper/gcov/statistics +++ b/sal/qa/helper/gcov/statistics @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # $Id: statistics,v 1.3 2003-06-11 16:38:03 vg Exp $ ./gcov_filter.pl -i ../../../util/sal.map --showallfunc FOO | sort | uniq >exportedfunctions.txt diff --git a/setup_native/scripts/deregister_extensions b/setup_native/scripts/deregister_extensions index 4a8f91de41f0..20af91108125 100644 --- a/setup_native/scripts/deregister_extensions +++ b/setup_native/scripts/deregister_extensions @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh USAGE="Usage: $0" diff --git a/setup_native/scripts/install_solaris.sh b/setup_native/scripts/install_solaris.sh index bb792bcf2618..dfdeaa867ed2 100644 --- a/setup_native/scripts/install_solaris.sh +++ b/setup_native/scripts/install_solaris.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/env bash ADD="no" LINK="no" diff --git a/setup_native/scripts/mac_install.script b/setup_native/scripts/mac_install.script index 2b34da1b04ed..e3dd5bfa798c 100644 --- a/setup_native/scripts/mac_install.script +++ b/setup_native/scripts/mac_install.script @@ -1,6 +1,6 @@ -#!/bin/bash +#!/bin/sh -# shell script as a workaraound since it is hard to impossible to store compiled +# shell script as a workaround since it is hard to impossible to store compiled # applescript in CVS and running osacompile would require a GUI session while # building (or root privileges) # using osascript only works when the shell script is camouflaged as application diff --git a/setup_native/scripts/register_extensions b/setup_native/scripts/register_extensions index 034642175c29..2dbbb05f50ed 100644 --- a/setup_native/scripts/register_extensions +++ b/setup_native/scripts/register_extensions @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh USAGE="Usage: $0" diff --git a/setup_native/scripts/uninstall_solaris.sh b/setup_native/scripts/uninstall_solaris.sh index 970191f08421..1e2a52466685 100644 --- a/setup_native/scripts/uninstall_solaris.sh +++ b/setup_native/scripts/uninstall_solaris.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # First parameter: Root path that will be removed # MY_ROOT=/export/home/is/root diff --git a/setup_native/tests/opensolaris/bundledextensions/send_ooo b/setup_native/tests/opensolaris/bundledextensions/send_ooo index 669e63ceda1b..9b260ec798b2 100644 --- a/setup_native/tests/opensolaris/bundledextensions/send_ooo +++ b/setup_native/tests/opensolaris/bundledextensions/send_ooo @@ -1,4 +1,4 @@ -#! /bin/bash +#!/bin/sh if [ $# = 0 ] diff --git a/slideshow/qa/debug/colors.sh b/slideshow/qa/debug/colors.sh index 559871fb848d..0810e336d9c2 100644 --- a/slideshow/qa/debug/colors.sh +++ b/slideshow/qa/debug/colors.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # # Output a PS file with a legend for the node state colors # @@ -13,4 +13,4 @@ digraph State_Colors node8 [label="FROZEN",style=filled,fillcolor="0.51986038541995898206292409109363,1.0,1.0"] node16 [label="ENDED",style=filled,fillcolor="0.69314718055994530941723212145818,1.0,1.0"] } -EOF
\ No newline at end of file +EOF diff --git a/slideshow/qa/debug/nodetree.sh b/slideshow/qa/debug/nodetree.sh index e40078faaddd..096eed38b0bd 100644 --- a/slideshow/qa/debug/nodetree.sh +++ b/slideshow/qa/debug/nodetree.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # # $Revision: 1.3 $ # diff --git a/solenv/bin/addsym-macosx.sh b/solenv/bin/addsym-macosx.sh index b69f59fff319..d3b396671e75 100755 --- a/solenv/bin/addsym-macosx.sh +++ b/solenv/bin/addsym-macosx.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # This script is needed in the process of generating exported # symbols list out of map files on Mac OS X (see also #i69351#) diff --git a/soltools/testhxx/create.pl b/soltools/testhxx/create.pl index 724aec0294f7..940d2f197439 100644 --- a/soltools/testhxx/create.pl +++ b/soltools/testhxx/create.pl @@ -32,7 +32,7 @@ if ($ENV{OS} eq 'LINUX') { $in =~ s!\s+-o\s*\S+! -o /dev/null! || die 'bad input: no -o'; $in =~ s!\S+/testhxx.cxx!-x c++ /proc/self/fd/0! || die 'bad input: no source file'; - print STDOUT '#!/bin/bash', "\n"; + print STDOUT '#!/bin/sh', "\n"; print STDOUT $in, ' <<<"#include \\"`echo $(if [ ${1%/*} != $1 ];then cd ${1%/*};fi;', '/bin/pwd)/${1##*/}`\\""', "\n"; diff --git a/sysui/desktop/share/makefile.mk b/sysui/desktop/share/makefile.mk index 934eb7e95455..c30aac7f4042 100644 --- a/sysui/desktop/share/makefile.mk +++ b/sysui/desktop/share/makefile.mk @@ -216,7 +216,7 @@ $(COMMONMISC)$/{$(PRODUCTLIST)}$/mimelnklist : ../mimetypes/{$(MIMELIST)}.deskto $(COMMONMISC)$/{$(PRODUCTLIST)}$/create_tree.sh : makefile.mk $(COMMONMISC)$/{$(PRODUCTLIST)}$/create_tree.sh : $$(@:f) @@-$(MKDIRHIER) $(@:d) - @echo "#\!/bin/bash" > $@.$(INPATH) + @echo "#\!/bin/sh" > $@.$(INPATH) @echo "PREFIX=$(UNIXFILENAME.$(@:d:d:f))" >> $@.$(INPATH) @echo "ICON_PREFIX=$(ICONPREFIX.$(@:d:d:f))" >> $@.$(INPATH) @echo "ICON_SOURCE_DIR=../../../desktop/icons" >> $@.$(INPATH) diff --git a/testautomation/tools/run_tests/run_tests.sh b/testautomation/tools/run_tests/run_tests.sh index cf08837f3bb2..908dbfb1f208 100755 --- a/testautomation/tools/run_tests/run_tests.sh +++ b/testautomation/tools/run_tests/run_tests.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh #************************************************************** # # Licensed to the Apache Software Foundation (ASF) under one @@ -41,7 +41,7 @@ sTestTool="" #------------------------------------------------------------------------ #--- internally used functions --- #------------------------------------------------------------------------ -function GetValueFromSection () +GetValueFromSection () # call with NameOfValue Section file { $AWK -v sVarName="$1" -v sSectionName="$2" \ diff --git a/toolkit/src2xml/dryrunall.sh b/toolkit/src2xml/dryrunall.sh index a2bd803cc7fb..8b3059d03a09 100644 --- a/toolkit/src2xml/dryrunall.sh +++ b/toolkit/src2xml/dryrunall.sh @@ -1,2 +1,2 @@ -#! /bin/bash +#!/bin/sh source/src2xml.py --dry-run --includes-from=include.lst $(cat src.lst) "$@" diff --git a/toolkit/src2xml/sc.sh b/toolkit/src2xml/sc.sh index 1bfb213ccf12..9d29041ba252 100644 --- a/toolkit/src2xml/sc.sh +++ b/toolkit/src2xml/sc.sh @@ -1,3 +1,3 @@ -#!/bin/bash +#!/bin/sh source/src2xml.py --include-path=$(tr '\n' ':' < include-sc.lst) --dry-run $(cat src-sc.lst) "$@" diff --git a/toolkit/src2xml/sd.sh b/toolkit/src2xml/sd.sh index 78b47201fc00..12aaccb68079 100644 --- a/toolkit/src2xml/sd.sh +++ b/toolkit/src2xml/sd.sh @@ -1,3 +1,3 @@ -#!/bin/bash +#!/bin/sh source/src2xml.py --include-path=$(tr '\n' ':' < include-sd.lst) --dry-run $(cat src-sd.lst) "$@" diff --git a/toolkit/src2xml/sw.sh b/toolkit/src2xml/sw.sh index 22f16d4b6c57..b0b870702877 100644 --- a/toolkit/src2xml/sw.sh +++ b/toolkit/src2xml/sw.sh @@ -1,3 +1,3 @@ -#! /bin/bash +#!/bin/sh source/src2xml.py --include-path=$(tr '\n' ':' < include-sw.lst) --dry-run $(cat src-sw.lst) "$@" diff --git a/writerfilter/source/doctok/cleanupresources b/writerfilter/source/doctok/cleanupresources index 646c1ea4e0a7..bdb457392a2a 100755 --- a/writerfilter/source/doctok/cleanupresources +++ b/writerfilter/source/doctok/cleanupresources @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh TEMP=`mktemp -t cleanupresources` xsltproc tidyxmi.xsl resources.xmi | xmllint --format - > $TEMP diff --git a/writerfilter/source/ooxml/status.sh b/writerfilter/source/ooxml/status.sh index c36ad0d65a37..0e9ac92d134d 100644 --- a/writerfilter/source/ooxml/status.sh +++ b/writerfilter/source/ooxml/status.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh SEARCHIN=$SRC_ROOT/writerfilter/source/dmapper |