Remove obsolete ipkg() modes

[hvlinux.git] / functions / main

diff --git a/functions/main b/functions/main
index 4af62ad..770c3b6 100644 (file)
--- a/functions/main
+++ b/functions/main
@@ -202,6 +202,40 @@ get_pkg_ver_underscore()
     echo ${1} | sed "s!.*_\([0-9].*\)!\1!g"
 }
 
+# Extracting the version number from a complete package name
+# when the package name uses the underscore as the separator.
+# Arg. #1: Complete package name with version (ex: icu4c-54_1 will output 54.1)
+get_pkg_ver_underscore2()
+{
+    # Checking for correct number of arguments
+    if [ $# -ne 1 ]; then
+       echo "${FUNCNAME}(), wrong number of arguments: ${*}"
+       return 1
+    fi
+
+    local v=$(get_pkg_ver ${1})
+
+    # Replace underscore by dot
+    echo ${v} | sed "s!_!\.!g"
+}
+
+# Convert package version dots to uderscore.
+# Ex: gcc-3.4.6 will output 3_4_6
+# Arg. #1: Complete package name with version
+ver_dots_to_underscore()
+{
+    # Checking for correct number of arguments
+    if [ $# -ne 1 ]; then
+       echo "${FUNCNAME}(), wrong number of arguments: ${*}"
+       return 1
+    fi
+
+    local v=$(get_pkg_ver ${1})
+
+    # Replace dots by underscores
+    echo ${v} | sed "s!\.!_!g"
+}
+
 # Extracting the first digit version number from a complete package name.
 # Arg. #1: Complete package name with version (ex: gcc-3.4.4 will output 3)
 get_pkg_ver1()
@@ -215,6 +249,20 @@ get_pkg_ver1()
     echo ${1} | sed "s!^.*-\([0-9]*\)\..*!\1!g"
 }
 
+# Extracting the first digit version number from a complete package name,
+# when the package name uses the underscore as the separator.
+# Arg. #1: Complete package name with version (ex: icu4c-54_1 will output 54)
+get_pkg_ver1_underscore()
+{
+    # Checking for correct number of arguments
+    if [ $# -ne 1 ]; then
+       echo "${FUNCNAME}(), wrong number of arguments: ${*}"
+       return 1
+    fi
+
+    echo ${1} | sed "s!^.*-\([0-9]*\)_.*!\1!g"
+}
+
 # Extracting the first 2 digits version number from a complete package name.
 # Arg. #1: Complete package name with version (ex: gcc-3.4.4 will output 3.4)
 get_pkg_ver2()
@@ -828,8 +876,6 @@ indicate_pkg_build_complete()
 #            ac   Standard autoconf package, build in separate dir (default)
 #            acnb Standard autoconf package, build in source dir
 #            noac No autoconf (configure)
-#            gnome
-#            xorg
 #            pm
 #   -t     Enable dependency tracking
 #   -s     Name of script to source (default is from name of package)
@@ -863,7 +909,7 @@ ipkg()
            m)
                 # Installation mode
                 case ${OPTARG} in
-                   ac|acnb|noac|gnome|xorg|pm)
+                   ac|acnb|noac|pm)
                         IPKG_MODE=${OPTARG}
                        ;;
                     *)