OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-registry Date: 12-May-2006 16:20:11
Branch: HEAD Handle: 2006051215201001
Modified files:
openpkg-registry register.sh rpm.sh
Log:
new detection for rpm command
Summary:
Revision Changes Path
1.30 +5 -6 openpkg-registry/register.sh
1.7 +4 -5 openpkg-registry/rpm.sh
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-registry/register.sh
============================================================================
$ cvs diff -u -r1.29 -r1.30 register.sh
--- openpkg-registry/register.sh 7 Mar 2006 13:09:46 -0000 1.29
+++ openpkg-registry/register.sh 12 May 2006 14:20:10 -0000 1.30
@@ -38,10 +38,9 @@
PREFIX="${OPENPKG_PREFIX}"
fi
-# determine old binary-only vs. shell+binary situation
-oldbinnewsh="$PREFIX/libexec/openpkg/rpm" # old binary rpm, new embedded
shell rpm
-oldnanewbin="$PREFIX/lib/openpkg/rpm" # old n/a, new binary rpm
-if [ -x $oldbinnewsh -a -x $oldnanewbin ]; then exec $oldnanewbin "$@"; fi
+# determine rpm
+rpm="$PREFIX/libexec/openpkg/rpm"
+[ -x "$PREFIX/lib/openpkg/rpm" ] && rpm="$PREFIX/lib/openpkg/rpm"
# http post
curl="$PREFIX/lib/openpkg/curl"
@@ -109,8 +108,8 @@
REGISTRY_DESC="openpkg://${HOSTNAME}${PREFIX}"
# advanced options
-REGISTRY_PLAT="`$oldbinnewsh --eval '%{l_platform -p}'`"
-REGISTRY_OREL="`$oldbinnewsh --eval '%{l_openpkg_release}'`"
+REGISTRY_PLAT="`$rpm --eval '%{l_platform -p}'`"
+REGISTRY_OREL="`$rpm --eval '%{l_openpkg_release}'`"
REGISTRY_UUID="$PREFIX/etc/openpkg/uuid"
REGISTRY_CONF="$PREFIX/etc/openpkg/register.conf"
REGISTRY_PREP="$PREFIX/etc/openpkg/register.prep"
@@ .
patch -p0 <<'@@ .'
Index: openpkg-registry/rpm.sh
============================================================================
$ cvs diff -u -r1.6 -r1.7 rpm.sh
--- openpkg-registry/rpm.sh 7 Feb 2006 10:45:24 -0000 1.6
+++ openpkg-registry/rpm.sh 12 May 2006 14:20:11 -0000 1.7
@@ -29,10 +29,9 @@
PREFIX="${OPENPKG_PREFIX}"
fi
-# determine old binary-only vs. shell+binary situation
-oldbinnewsh="$PREFIX/libexec/openpkg/rpm" # old binary rpm, new embedded
shell rpm
-oldnanewbin="$PREFIX/lib/openpkg/rpm" # old n/a, new binary rpm
-if [ -x $oldbinnewsh -a -x $oldnanewbin ]; then exec $oldnanewbin "$@"; fi
+# determine rpm
+rpm="$PREFIX/libexec/openpkg/rpm"
+[ -x "$PREFIX/lib/openpkg/rpm" ] && rpm="$PREFIX/lib/openpkg/rpm"
# determine whether URL rewriting is active
rewrite=0
@@ -56,5 +55,5 @@
# stealth mode
:
fi
-exec $oldbinnewsh "$@"
+exec $rpm "$@"
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
