RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Pinto Elia
Root: /v/rpm/cvs Email: devzero2...@rpm5.org
Module: rpm Date: 12-Oct-2011 18:51:52
Branch: rpm-5_4 Handle: 2011101216515101
Modified files: (Branch: rpm-5_4)
rpm CHANGES
rpm/scripts dbconvert.sh gstreamer.sh
Log:
get rid of bashisms in dbconvert.sh and gstreamer.sh
Fix the following error reported by checkbashisms (debian devscript
package)
dbconvert.sh
------------
possible bashism in dbconvert.sh line 15 (${parm/?/pat[/str]}):
possible bashism in dbconvert.sh line 22 (should be 'b = a'):
possible bashism in dbconvert.sh line 39 ('((' should be '$(('):
possible bashism in dbconvert.sh line 47 (should be 'b = a'):
possible bashism in dbconvert.sh line 58 (should be >word 2>&1):
possible bashism in dbconvert.sh line 59 (should be 'b = a'):
possible bashism in dbconvert.sh line 69 (brace expansion):
gstreamer.sh
------------
possible bashism in gstreamer.sh line 30 ('function' is useless):
possible bashism in gstreamer.sh line 36 ('function' is useless):
_
Reference:
https://wiki.ubuntu.com/DashAsBinSh
http://mywiki.wooledge.org/Bashism
Summary:
Revision Changes Path
1.3501.2.182+1 -0 rpm/CHANGES
1.11.2.2 +16 -7 rpm/scripts/dbconvert.sh
1.1.2.3 +2 -2 rpm/scripts/gstreamer.sh
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.3501.2.181 -r1.3501.2.182 CHANGES
--- rpm/CHANGES 1 Oct 2011 15:19:04 -0000 1.3501.2.181
+++ rpm/CHANGES 12 Oct 2011 16:51:51 -0000 1.3501.2.182
@@ -1,4 +1,5 @@
5.4.3 -> 5.4.4:
+ - devzero2000: get rid of bashisms in dbconvert.sh and gstreamer.sh
- jbj: start rpm-5.4.4 development.
5.4.2 -> 5.4.3:
@@ .
patch -p0 <<'@@ .'
Index: rpm/scripts/dbconvert.sh
============================================================================
$ cvs diff -u -r1.11.2.1 -r1.11.2.2 dbconvert.sh
--- rpm/scripts/dbconvert.sh 7 Jan 2011 00:09:07 -0000 1.11.2.1
+++ rpm/scripts/dbconvert.sh 12 Oct 2011 16:51:52 -0000 1.11.2.2
@@ -12,14 +12,15 @@
DBVERSION=5.1
DBERROR=0
for db_tool in db_stat db_dump db_load db_recover; do
- tool=$(which ${db_tool/db_/db${DBVERSION/./}_} || which $db_tool 2>
/dev/null)
+ db_tool_versioned=$(echo $db_tool | sed -e 's/^db_/db'"${DBVERSION}"'/'
-e 's/^db\([0-9]*\)\.\([0-9]*\)/db\1\2_/')
+ tool=$(which ${db_tool_versioned} || which $db_tool 2> /dev/null)
if [ -z "$tool" -o ! -x "$tool" ]; then
echo "Unable to locate $db_tool"
DBERROR=1
else
tool_version="$($tool -V |sed 's/^Berkeley DB
\([0-9]\+\.[0-9]\+\).*/\1/')"
[ $DBVERBOSE -ne 0 ] && echo "Found $db_tool: $tool version:
$tool_version"
- if [ "$tool_version" == "$DBVERSION" ]; then
+ if [ "$tool_version" = "$DBVERSION" ]; then
export $db_tool=$tool
else
echo "Incompatible $db_tool version ($tool_version) found,
$DBVERSION.* required"
@@ -36,7 +37,7 @@
for line in `$db_dump "$DBHOME/Packages"|head`; do
if [ $HEADER -eq 0 ]; then
[ $DATA -eq 0 -a $((0x$line)) -eq 0 ] && continue
- ((DATA++))
+ DATA=`expr $DATA + 1`
if [ $((0x$line)) -ge 10000000 ]; then
LORDER=1234
else
@@ -44,7 +45,7 @@
fi
break
fi
- if [ "$line" == "HEADER=END" ]; then
+ if [ "$line" = "HEADER=END" ]; then
HEADER=0
fi
done
@@ -55,8 +56,8 @@
# Database is assumed to be converted, so let's ditch it
if [ $($db_stat -f -d "$DBHOME/Packages" |grep -c 'Btree magic number') -ne
0 -o $LORDER -eq 4321 ] && \
- rpm --dbpath "$DBHOME" -qa &> /dev/null && rpm --dbpath "$DBHOME" -q rpm
&> /dev/null; then
- if [ "$DBFORCE" == 0 ]; then
+ rpm --dbpath "$DBHOME" -qa >/dev/null 2>&1 && rpm --dbpath "$DBHOME" -q
rpm >/dev/null 2>&1 ; then
+ if [ "$DBFORCE" -eq 0 ]; then
[ $DBVERBOSE -ne 0 ] && echo "rpmdb already converted, set variable
DBFORCE=1 to force"
exit 0
fi
@@ -66,7 +67,15 @@
echo "Converting system database."
rm -rf "$NEWDB"
-mkdir -p {"$DBHOME","$NEWDB"}/{log,tmp}
+# XXXX Poor men brace bash expansion
+for _var in "$DBHOME" "$NEWDB"
+do
+ for _var1 in log tmp
+ do
+ mkdir -p "${_var}"/"${_var1}"
+ done
+done
+
if [ "$DBHOME" != "/var/lib/rpm" ]; then
if [ -f /var/lib/rpm/DB_CONFIG ]; then
cp /var/lib/rpm/DB_CONFIG "$NEWDB/DB_CONFIG"
@@ .
patch -p0 <<'@@ .'
Index: rpm/scripts/gstreamer.sh
============================================================================
$ cvs diff -u -r1.1.2.2 -r1.1.2.3 gstreamer.sh
--- rpm/scripts/gstreamer.sh 1 Apr 2011 05:16:20 -0000 1.1.2.2
+++ rpm/scripts/gstreamer.sh 12 Oct 2011 16:51:52 -0000 1.1.2.3
@@ -27,13 +27,13 @@
solist=$(echo $filelist | grep "libgst" | \
xargs file -L 2>/dev/null | grep "ELF.*shared object" | cut -d: -f1 )
-function getmark()
+getmark()
{
lib64=`if file -L $1 2>/dev/null | \
grep "ELF 64-bit" >/dev/null; then echo -n "$mark64"; fi`
}
-function libdir()
+libdir()
{
buildlibdir=`dirname $1`
buildlibdir=`dirname $buildlibdir`
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
