From 91b918d040d4574baef75c3f7354ff014f4e0e2f Mon Sep 17 00:00:00 2001
From: "Ralf S. Engelschall" <rse@openpkg.org>
Date: Thu, 1 Apr 2004 20:10:55 +0000
Subject: [PATCH] fix 'openpkg install openpkg-tool' bootstrapping command

---
 openpkg/HISTORY      |  1 +
 openpkg/install.sh   | 18 +++++++++++-------
 openpkg/openpkg.spec |  2 +-
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/openpkg/HISTORY b/openpkg/HISTORY
index 0b465e2a61..1a7a25f0b4 100644
--- a/openpkg/HISTORY
+++ b/openpkg/HISTORY
@@ -2,6 +2,7 @@
 2004
 ====
 
+20040401 fix "openpkg install openpkg-tool" bootstrapping command
 20040324 fix %l_check_nosource: the output went directly into the shell scripts
 20040320 upgrade to cURL 7.11.1
 20040320 bump provide for 2.0.0-2.0.0
diff --git a/openpkg/install.sh b/openpkg/install.sh
index 1871e1f501..d77fabc7a1 100644
--- a/openpkg/install.sh
+++ b/openpkg/install.sh
@@ -1,3 +1,4 @@
+#!@l_prefix@/lib/openpkg/bash
 ##
 ##  install -- OpenPKG Tool Chain "install" command (BOOSTRAP VERSION ONLY)
 ##  Copyright (c) 2004 The OpenPKG Project <http://www.openpkg.org/>
@@ -32,11 +33,11 @@
 if [ $# -eq 1 -a ".$1" = ".openpkg-tools" ]; then
     :
 else
-    echo "openpkg:ERROR: still not available functionality \"$cmd $*\""                   1>&2
-    echo "openpkg: This functionality is provided by the \"openpkg-tools\" package only!" 1>&2
-    echo "openpkg: Run the command \"$OPENPKG_PREFIX/bin/openpkg install openpkg-tools\" to"    1>&2
-    echo "openpkg: bootstrap the \"openpkg-tools\" package for additional functionality." 1>&2
-    echo "openpkg: This bootstrap version only supports this particular install command." 1>&2
+    echo "openpkg:ERROR: still not available functionality \"install $*\""                        1>&2
+    echo "openpkg:INFO: This functionality is provided by the \"openpkg-tools\" package only!"    1>&2
+    echo "openpkg:INFO: Run the command \"$OPENPKG_PREFIX/bin/openpkg install openpkg-tools\" to" 1>&2
+    echo "openpkg:INFO: bootstrap the \"openpkg-tools\" package for additional functionality."    1>&2
+    echo "openpkg:INFO: This bootstrap version only supports this particular install command."    1>&2
     exit 1
 fi
 
@@ -72,7 +73,10 @@ for pkg in openpkg make binutils gcc perl openpkg-tools; do
         fi
         pkg_name=`$OPENPKG_PREFIX/lib/openpkg/curl -s -l "$url/" |\
             egrep "^${pkg}-[0-9]" |\
-            sed -e "s;^${pkg}-\\([0-9][^-]*\\)-\\([^-][^-]*\\)\\.src\\.rpm.*;\\2:\\1;" |\
+            sed -e "s;^;X;" \
+                -e "s;^X${pkg}-\\([0-9][^-]*\\)-\\([^-][^-]*\\)\\.src\\.rpm.*;\\2:\\1;" \
+                -e "s;^X${pkg}-\\([0-9][^-]*\\)-\\([^-][^-]*\\)\\.src\\.sh.*;\\2:\\1;" \
+                -e "s;^X.*;;" |\
             sort -r | head -1 |\
             sed -e "s;^\\([^:]*\\):\\(.*\\);${pkg}-\\2-\\1;"`
         if [ ".$pkg_name" != . ]; then
@@ -90,7 +94,7 @@ for pkg in openpkg make binutils gcc perl openpkg-tools; do
     fi
 
     #   check whether package is already installed
-    if [ ".`$OPENPKG_PREFIX/bin/openpkg rpm -q $pkg_name | grep -v 'is not installed'`" != . ]; the
+    if [ ".`$OPENPKG_PREFIX/bin/openpkg rpm -q $pkg_name | grep -v 'is not installed'`" != . ]; then
         continue
     fi
 
diff --git a/openpkg/openpkg.spec b/openpkg/openpkg.spec
index 956e9f263a..8944dc76ad 100644
--- a/openpkg/openpkg.spec
+++ b/openpkg/openpkg.spec
@@ -39,7 +39,7 @@
 #   o any cc(1)
 
 #   the package version/release
-%define       V_openpkg  20040324
+%define       V_openpkg  20040401
 
 #   the used software versions
 %define       V_rpm      4.2.1