STYLE: remove tabs and trailing space from new scripts

This commit is contained in:
Mark Olesen
2010-07-02 09:14:10 +02:00
parent 5810f991d7
commit 266c4c61da
3 changed files with 23 additions and 24 deletions

View File

@ -34,10 +34,10 @@ usage() {
cat<<USAGE cat<<USAGE
usage: ${0##*/} usage: ${0##*/}
--foamInstall dir specify installation directory (e.g. /opt) --foamInstall dir specify installation directory (e.g. /opt)
--projectName name specify project name (e.g. openfoam170) --projectName name specify project name (e.g. openfoam170)
--archOption arch specify architecture option (only 32 or 64 applicable) --archOption arch specify architecture option (only 32 or 64 applicable)
--paraviewInstall dir specify ParaView_DIR (e.g. /opt/paraviewopenfoam380) --paraviewInstall dir specify ParaView_DIR (e.g. /opt/paraviewopenfoam380)
* hardcode paths to installation * hardcode paths to installation
@ -59,30 +59,30 @@ do
;; ;;
--foamInstall) --foamInstall)
[ "$#" -ge 2 ] || usage "'$1' option requires an argument" [ "$#" -ge 2 ] || usage "'$1' option requires an argument"
foamInstall="$2" foamInstall="$2"
echo "Replacing foamInstall setting by $foamInstall" echo "Replacing foamInstall setting by $foamInstall"
sed -i -e '/^[^#]/s@foamInstall=.*@foamInstall='"$foamInstall@" etc/bashrc sed -i -e '/^[^#]/s@foamInstall=.*@foamInstall='"$foamInstall@" etc/bashrc
shift 2 shift 2
;; ;;
--projectName) --projectName)
[ "$#" -ge 2 ] || usage "'$1' option requires an argument" [ "$#" -ge 2 ] || usage "'$1' option requires an argument"
projectName="$2" projectName="$2"
echo "Replacing WM_PROJECT_DIR setting by $projectName" echo "Replacing WM_PROJECT_DIR setting by $projectName"
sed -i -e '/^[^#]/s@WM_PROJECT_DIR=.*@WM_PROJECT_DIR=$WM_PROJECT_INST_DIR/'"$projectName@" etc/bashrc sed -i -e '/^[^#]/s@WM_PROJECT_DIR=.*@WM_PROJECT_DIR=$WM_PROJECT_INST_DIR/'"$projectName@" etc/bashrc
shift 2 shift 2
;; ;;
--archOption) --archOption)
[ "$#" -ge 2 ] || usage "'$1' option requires an argument" [ "$#" -ge 2 ] || usage "'$1' option requires an argument"
archOption="$2" archOption="$2"
echo "Replacing WM_ARCH_OPTION setting by $archOption" echo "Replacing WM_ARCH_OPTION setting by $archOption"
sed -i -e '/^[^#]/s@: ${WM_ARCH_OPTION:=64}@WM_ARCH_OPTION='"$archOption@" etc/bashrc sed -i -e '/^[^#]/s@: ${WM_ARCH_OPTION:=64}@WM_ARCH_OPTION='"$archOption@" etc/bashrc
shift 2 shift 2
;; ;;
--paraviewInstall) --paraviewInstall)
[ "$#" -ge 2 ] || usage "'$1' option requires an argument" [ "$#" -ge 2 ] || usage "'$1' option requires an argument"
paraviewInstall="$2" paraviewInstall="$2"
echo "Replacing ParaView_DIR setting by $paraviewInstall" echo "Replacing ParaView_DIR setting by $paraviewInstall"
sed -i -e '/^[^#]/s@ParaView_DIR=.*@ParaView_DIR='"$paraviewInstall@" etc/apps/paraview3/bashrc sed -i -e '/^[^#]/s@ParaView_DIR=.*@ParaView_DIR='"$paraviewInstall@" etc/apps/paraview3/bashrc
shift 2 shift 2
;; ;;
*) *)
@ -99,10 +99,9 @@ done
# Replace the WM_MPLIB always # Replace the WM_MPLIB always
echo "Replacing WM_MPLIB setting by SYSTEMOPENMPI" echo "Replacing WM_MPLIB setting by SYSTEMOPENMPI"
sed -i -e '/^[^#]/s@: ${WM_MPLIB:=.*}@WM_MPLIB=SYSTEMOPENMPI@' etc/bashrc sed -i -e '/^[^#]/s@: ${WM_MPLIB:=.*}@WM_MPLIB=SYSTEMOPENMPI@' etc/bashrc
# Replace the compilerInstall always # Replace the compilerInstall always
echo "Replacing compilerInstall setting by system" echo "Replacing compilerInstall setting by system"
sed -i -e '/^[^#]/s@: ${compilerInstall:=.*}@compilerInstall=system@' etc/settings.sh sed -i -e '/^[^#]/s@: ${compilerInstall:=.*}@compilerInstall=system@' etc/settings.sh
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------

2
debian/copyright vendored
View File

@ -27,4 +27,4 @@ The Debian packaging is:
Copyright (C) 2010 OpenCFD Ltd. <patches@opencfd.co.uk> Copyright (C) 2010 OpenCFD Ltd. <patches@opencfd.co.uk>
and is licensed under the GPL version 3 and is licensed under the GPL version 3

4
debian/rules vendored
View File

@ -96,13 +96,13 @@ binary-arch: build install
dh_fixperms dh_fixperms
dh_makeshlibs dh_makeshlibs
dh_installdeb dh_installdeb
# dh_perl # dh_perl
dh_shlibdeps -- --ignore-missing-info #We depend on vtk libs without info dh_shlibdeps -- --ignore-missing-info #We depend on vtk libs without info
dh_gencontrol dh_gencontrol
dh_md5sums dh_md5sums
dh_builddeb dh_builddeb
source diff: source diff:
@echo >&2 'source and diff are obsolete - use dpkg-source -b'; false @echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
binary: binary-indep binary-arch binary: binary-indep binary-arch