Browse Source

Removed superfluous "" and '' when assigning an empty value to bash variables in *.in

early
Alejandro Mery 17 years ago
parent
commit
387f135812
  1. 10
      base/gcc/config-550.in
  2. 11
      java/blackdown-jre/java-blackdown-conf.in
  3. 6
      java/ibm-jre-142/java-ibm-conf.in
  4. 11
      java/java-dirtree/java-conf.in
  5. 6
      java/sun-jre-142/java-sun-conf.in
  6. 4
      mail/sendmail/config.in
  7. 2
      multimedia/deva/deva.conf
  8. 4
      printing/lprng/config.in
  9. 4
      security/loop-aes/patch_o_matic.in

10
base/gcc/config-550.in

@ -2,7 +2,7 @@
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
# #
# Filename: package/.../gcc/config-550.in # Filename: package/.../gcc/config-550.in
# Copyright (C) 2006 - 2007 The OpenSDE Project # Copyright (C) 2006 - 2008 The OpenSDE Project
# Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project
# Copyright (C) 1998 - 2003 Clifford Wolf # Copyright (C) 1998 - 2003 Clifford Wolf
# #
@ -16,7 +16,7 @@
menu_begin MENU_COMPILER 'Selecting compiler' menu_begin MENU_COMPILER 'Selecting compiler'
pkgout pkgout
default='' ; list='' default= ; list=
while read pkg ver ; do while read pkg ver ; do
default=${default:-$pkg} ; [ $pkg = gcc3 ] && default=gcc3 default=${default:-$pkg} ; [ $pkg = gcc3 ] && default=gcc3
list="$list $pkg Use_${pkg}_($ver)_as_standard_C_compiler" list="$list $pkg Use_${pkg}_($ver)_as_standard_C_compiler"
@ -41,7 +41,7 @@ menu_begin MENU_COMPILER 'Selecting compiler'
fi fi
pkgout pkgout
default='' ; list='' default= ; list=
while read pkg ver ; do while read pkg ver ; do
default=${default:-$pkg} ; [ $pkg = gcc3 ] && default=gcc3 default=${default:-$pkg} ; [ $pkg = gcc3 ] && default=gcc3
list="$list $pkg Use_${pkg}_($ver)_as_kernel_C_compiler" list="$list $pkg Use_${pkg}_($ver)_as_kernel_C_compiler"
@ -52,7 +52,7 @@ menu_begin MENU_COMPILER 'Selecting compiler'
choice SDECFG_DEFAULT_KCC $default $list choice SDECFG_DEFAULT_KCC $default $list
pkgout pkgout
default='' ; list='' default= ; list=
while read pkg ver ; do while read pkg ver ; do
default=${default:-$pkg} ; [ $pkg = gcc3 ] && default=gcc3 default=${default:-$pkg} ; [ $pkg = gcc3 ] && default=gcc3
list="$list $pkg Use_${pkg}_($ver)_as_standard_C++_compiler" list="$list $pkg Use_${pkg}_($ver)_as_standard_C++_compiler"
@ -63,7 +63,7 @@ menu_begin MENU_COMPILER 'Selecting compiler'
choice SDECFG_DEFAULT_CXX $default $list choice SDECFG_DEFAULT_CXX $default $list
pkgout pkgout
default='' ; list='' default= ; list=
while read pkg ver ; do while read pkg ver ; do
default=${default:-$pkg} ; [ $pkg = gcc3 ] && default=gcc3 default=${default:-$pkg} ; [ $pkg = gcc3 ] && default=gcc3
list="$list $pkg Use_${pkg}_($ver)_as_standard_F77_compiler" list="$list $pkg Use_${pkg}_($ver)_as_standard_F77_compiler"

11
java/blackdown-jre/java-blackdown-conf.in

@ -1,8 +1,9 @@
#!/bin/sh #!/bin/sh
# --- T2-COPYRIGHT-NOTE-BEGIN --- # --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
# #
# T2 SDE: package/.../blackdown-jre/java-blackdown-conf.in # Filename: package/.../blackdown-jre/java-blackdown-conf.in
# Copyright (C) 2008 The OpenSDE Project
# Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project
# Copyright (C) 1998 - 2005 Clifford Wolf # Copyright (C) 1998 - 2005 Clifford Wolf
# #
@ -12,7 +13,7 @@
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License. A copy of the # the Free Software Foundation; version 2 of the License. A copy of the
# GNU General Public License can be found in the file COPYING. # GNU General Public License can be found in the file COPYING.
# --- T2-COPYRIGHT-NOTE-END --- # --- SDE-COPYRIGHT-NOTE-END ---
# Prevent normal package extraction. However since auto package # Prevent normal package extraction. However since auto package
# extraction is turned off, so are the pre and post patch hooks. # extraction is turned off, so are the pre and post patch hooks.
@ -21,8 +22,8 @@ autoextract=0
# Prevent executing normal make and install build steps. # Prevent executing normal make and install build steps.
# This package has custom make and install. # This package has custom make and install.
makeopt='' makeopt=
makeinstopt='' makeinstopt=
# Make prefix same a java_home. This way artifacts like the bin, lib # Make prefix same a java_home. This way artifacts like the bin, lib
# and doc directory are created at the proper level. # and doc directory are created at the proper level.

6
java/ibm-jre-142/java-ibm-conf.in

@ -3,7 +3,7 @@
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
# #
# Filename: package/.../ibm-jre-142/java-ibm-conf.in # Filename: package/.../ibm-jre-142/java-ibm-conf.in
# Copyright (C) 2006 - 2007 The OpenSDE Project # Copyright (C) 2006 - 2008 The OpenSDE Project
# Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project
# Copyright (C) 1998 - 2005 Clifford Wolf # Copyright (C) 1998 - 2005 Clifford Wolf
# #
@ -20,8 +20,8 @@ java_pkg_type=$1
# Prevent executing normal make and install build steps. # Prevent executing normal make and install build steps.
# This package has custom make and install. # This package has custom make and install.
makeopt='' makeopt=
makeinstopt='' makeinstopt=
# Make prefix same a java_home. This way artifacts like the bin, lib # Make prefix same a java_home. This way artifacts like the bin, lib
# and doc directory are created at the proper level. # and doc directory are created at the proper level.

11
java/java-dirtree/java-conf.in

@ -1,8 +1,9 @@
#!/bin/sh #!/bin/sh
# --- T2-COPYRIGHT-NOTE-BEGIN --- # --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
# #
# T2 SDE: package/.../java-dirtree/java-conf.in # Filename: package/.../java-dirtree/java-conf.in
# Copyright (C) 2008 The OpenSDE Project
# Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project
# #
# More information can be found in the files COPYING and README. # More information can be found in the files COPYING and README.
@ -11,7 +12,7 @@
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License. A copy of the # the Free Software Foundation; version 2 of the License. A copy of the
# GNU General Public License can be found in the file COPYING. # GNU General Public License can be found in the file COPYING.
# --- T2-COPYRIGHT-NOTE-END --- # --- SDE-COPYRIGHT-NOTE-END ---
# Common java configuration is needed as well. # Common java configuration is needed as well.
. $base/package/*/*/java-common-conf.in . $base/package/*/*/java-common-conf.in
@ -22,8 +23,8 @@ build_type=
# Prevent executing normal make and install build steps. # Prevent executing normal make and install build steps.
# Java packages have custom make and install. # Java packages have custom make and install.
makeopt='' makeopt=
makeinstopt='' makeinstopt=
# Set variables used for building java sources to there default values. # Set variables used for building java sources to there default values.
# builddocdir - Location where documentation can be found after building. # builddocdir - Location where documentation can be found after building.

6
java/sun-jre-142/java-sun-conf.in

@ -3,7 +3,7 @@
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
# #
# Filename: package/.../sun-jre-142/java-sun-conf.in # Filename: package/.../sun-jre-142/java-sun-conf.in
# Copyright (C) 2007 The OpenSDE Project # Copyright (C) 2007 - 2008 The OpenSDE Project
# Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project
# Copyright (C) 1998 - 2005 Clifford Wolf # Copyright (C) 1998 - 2005 Clifford Wolf
# #
@ -22,8 +22,8 @@ autoextract=0
# Prevent executing normal make and install build steps. # Prevent executing normal make and install build steps.
# This package has custom make and install. # This package has custom make and install.
makeopt='' makeopt=
makeinstopt='' makeinstopt=
# Make prefix same a java_home. This way artifacts like the bin, lib # Make prefix same a java_home. This way artifacts like the bin, lib
# and doc directory are created at the proper level. # and doc directory are created at the proper level.

4
mail/sendmail/config.in

@ -2,7 +2,7 @@
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
# #
# Filename: package/.../sendmail/config.in # Filename: package/.../sendmail/config.in
# Copyright (C) 2006 The OpenSDE Project # Copyright (C) 2006 - 2008 The OpenSDE Project
# Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project
# Copyright (C) 1998 - 2003 Clifford Wolf # Copyright (C) 1998 - 2003 Clifford Wolf
# #
@ -16,7 +16,7 @@
menu_begin MENU_MAILER 'Selecting MTA (mail transfer agent)' menu_begin MENU_MAILER 'Selecting MTA (mail transfer agent)'
pkgout pkgout
default=''; list='' default=; list=
while read pkg ver ; do while read pkg ver ; do
default=${default:-$pkg} default=${default:-$pkg}
[ $pkg = sendmail ] && default=sendmail [ $pkg = sendmail ] && default=sendmail

2
multimedia/deva/deva.conf

@ -22,7 +22,7 @@ fi
autoextract=0 autoextract=0
# no make install # no make install
makeinstopt= makeinstopt=
deva_pre () { deva_pre () {
rpm2cpio `match_source_file -p Deva` | cpio -i ; \ rpm2cpio `match_source_file -p Deva` | cpio -i ; \

4
printing/lprng/config.in

@ -2,7 +2,7 @@
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
# #
# Filename: package/.../lprng/config.in # Filename: package/.../lprng/config.in
# Copyright (C) 2006 The OpenSDE Project # Copyright (C) 2006 - 2008 The OpenSDE Project
# Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project
# Copyright (C) 1998 - 2003 Clifford Wolf # Copyright (C) 1998 - 2003 Clifford Wolf
# #
@ -15,7 +15,7 @@
# --- SDE-COPYRIGHT-NOTE-END --- # --- SDE-COPYRIGHT-NOTE-END ---
menu_begin MENU_PRINTER 'Selecting Print System' menu_begin MENU_PRINTER 'Selecting Print System'
pkgout; list='' pkgout; list=
while read pkg ver ; do while read pkg ver ; do
list="$list $pkg Use_${pkg}_($ver)_as_standard_printer" list="$list $pkg Use_${pkg}_($ver)_as_standard_printer"
done < <(grep "^X .* PRINTER " $cfgtmpdir/config/packages | cut -f5,6 -d' ') done < <(grep "^X .* PRINTER " $cfgtmpdir/config/packages | cut -f5,6 -d' ')

4
security/loop-aes/patch_o_matic.in

@ -3,7 +3,7 @@
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
# #
# Filename: package/.../loop-aes/patch_o_matic.in # Filename: package/.../loop-aes/patch_o_matic.in
# Copyright (C) 2006 The OpenSDE Project # Copyright (C) 2006 - 2008 The OpenSDE Project
# Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project
# #
# More information can be found in the files COPYING and README. # More information can be found in the files COPYING and README.
@ -38,7 +38,7 @@ if aespatch="`match_source_file loop-AES loop-aes`"; then
elif [[ $ver = 2.4* ]]; then elif [[ $ver = 2.4* ]]; then
patchfile=$( echo /tmp/${1%.tar*}/kernel-2.4*.diff ) patchfile=$( echo /tmp/${1%.tar*}/kernel-2.4*.diff )
else else
patchfile='' patchfile=
fi fi
var_append patchfiles ' ' $patchfile var_append patchfiles ' ' $patchfile

Loading…
Cancel
Save