From 77534078e35a2a49805b11acfb8a8d82c29e2ad5 Mon Sep 17 00:00:00 2001
From: "mauro.giachero" <mauro.giachero@18908463-3d48-0410-af50-6b38eb639d31>
Date: Thu, 21 May 2009 16:34:34 +0000
Subject: [PATCH] Do not use the ARCH variable.

ARCH is a special name for SlackBuilds, and it will get even
more important now that Slackware is going to support x86_64.
This patch makes sure sbopkg doesn't use it internally any
more.

Signed-off-by: Mauro Giachero <mauro.giachero@gmail.com>
---
 src/usr/sbin/sbopkg | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/usr/sbin/sbopkg b/src/usr/sbin/sbopkg
index abefacf..850d1a4 100755
--- a/src/usr/sbin/sbopkg
+++ b/src/usr/sbin/sbopkg
@@ -519,9 +519,9 @@ check_for_updates() {
     local NEWSB NEWINFO NEWVER
     local VERSION_EXPRESSION
     local UPDATELIST VERSION_FILE PROGRESSBAR_INTERRUPTED
-    local STRING INDEX OLDNAME NAME VER ARCH BUILD
+    local STRING INDEX OLDNAME NAME VER INST_ARCH BUILD
     local VER_NUMERIC NEWVER_NUMERIC UPDATED
-    local PKGS NUMPKGS PROGRESSCOUNTER=0
+    local CURPKG PKGS NUMPKGS PROGRESSCOUNTER=0
 
     if [[ -z $REPO_TOOL ]]; then
         if [[ $DIAG ]]; then
@@ -563,8 +563,8 @@ check_for_updates() {
             OLDNAME="$(echo $STRING | cut -f 1-$OLDNAME -d -)"
             VER=$(expr $INDEX - 2)
             VER="$(echo $STRING | cut -f $VER -d -)"
-            ARCH=$(expr $INDEX - 1)
-            ARCH="$(echo $STRING | cut -f $ARCH -d -)"
+            INST_ARCH=$(expr $INDEX - 1)
+            INST_ARCH="$(echo $STRING | cut -f $INST_ARCH -d -)"
             BUILD="$(echo $STRING | cut -f $INDEX -d -)"
             # End pkgtool code
 
@@ -963,7 +963,7 @@ info_item() {
 
     local OLDPKG CATEGORY SHORTPATH CURVERSION CURARCH CURBUILD
     local CURAPP LONGAPP SHORTAPP
-    local STRING INDEX NAME VER BUILD DEFAULTITEM
+    local STRING INDEX NAME INST_ARCH VER BUILD DEFAULTITEM
     local CURPACKAGE INSTALLEDPACKAGE MENUPACKAGE TITLEPACKAGE RENAMEDPACKAGE
     local CHOICE PARSED_SLACK_DESC
     local APP="$(< $SBOPKGTMP/sbopkg_item_selection)"
@@ -998,14 +998,14 @@ info_item() {
                 NAME="$(echo $STRING | cut -f 1-$NAME -d -)"
                 VER=$(expr $INDEX - 2)
                 VER="$(echo $STRING | cut -f $VER -d -)"
-                ARCH=$(expr $INDEX - 1)
-                ARCH="$(echo $STRING | cut -f $ARCH -d -)"
+                INST_ARCH=$(expr $INDEX - 1)
+                INST_ARCH="$(echo $STRING | cut -f $INST_ARCH -d -)"
                 BUILD="$(echo $STRING | cut -f $INDEX -d -)"
 
                 if [[ $SHORTAPP == $APP ]]; then
-                    INSTALLEDPACKAGE=$NAME-$VER-$ARCH-$BUILD
+                    INSTALLEDPACKAGE=$NAME-$VER-$INST_ARCH-$BUILD
                 else # Must be a renamed app
-                    RENAMEDPACKAGE=$NAME-$VER-$ARCH-$BUILD
+                    RENAMEDPACKAGE=$NAME-$VER-$INST_ARCH-$BUILD
                 fi
             fi
         done