[haiku-commits] r36534 - haiku/trunk/data/bin

  • From: mattmadia@xxxxxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Thu, 29 Apr 2010 17:56:47 +0200 (CEST)

Author: mmadia
Date: 2010-04-29 17:56:46 +0200 (Thu, 29 Apr 2010)
New Revision: 36534
Changeset: http://dev.haiku-os.org/changeset/36534/haiku
Ticket: http://dev.haiku-os.org/ticket/5854

Modified:
   haiku/trunk/data/bin/installoptionalpackage
Log:
Added support for case-insensitive recognition of package names. Fixes #5854.


Modified: haiku/trunk/data/bin/installoptionalpackage
===================================================================
--- haiku/trunk/data/bin/installoptionalpackage 2010-04-29 15:50:22 UTC (rev 
36533)
+++ haiku/trunk/data/bin/installoptionalpackage 2010-04-29 15:56:46 UTC (rev 
36534)
@@ -393,7 +393,7 @@
        # read list into associative array
        while read line ; do
                local pkg=`echo ${line} | awk '{print $1}'`
-               local pkgDeps=${line/':'/}
+               local pkgDeps=${line/"${pkg} :"/}
                availablePackages[${pkg}]="${pkgDeps}"
                availablePackagesKeys="${availablePackagesKeys} ${pkg}"
        done < ${file}
@@ -419,8 +419,9 @@
 
                nonRepeatingDeps=""
                GetPackageDependencies "$pkg"
+               local lowerCasePkg=`echo ${pkg} | tr '[A-Z]' '[a-z]'`
                if IsPackageAndDepsOkToInstall ${pkg} ; then
-                       echo "${pkg} : ${nonRepeatingDeps}"  >> ${file}
+                       echo "${lowerCasePkg} : ${pkg} ${nonRepeatingDeps}"  >> 
${file}
                fi
 
        done < ${file}.temp
@@ -483,7 +484,8 @@
                shift
        fi
        while [ $# -gt 0 ]; do
-               wantsToInstall="${wantsToInstall} $1"
+               local lowerCase=`echo $1 | tr '[A-Z]' '[a-z]'`
+               wantsToInstall="${wantsToInstall} $lowerCase"
                shift
        done
 }


Other related posts:

  • » [haiku-commits] r36534 - haiku/trunk/data/bin - mattmadia