Add a subsection on the bootloaders

[openwrt.git] / scripts / ipkg

diff --git a/scripts/ipkg b/scripts/ipkg
index 7ceaeff..97a3151 100755 (executable)
--- a/scripts/ipkg
+++ b/scripts/ipkg
@@ -32,6 +32,8 @@ ipkg_is_upgrade () {
   return 1
 }         
 
   return 1
 }         
 

+which md5sum 2>&1 >/dev/null || alias md5sum=md5
+

 ipkg_srcs() {
        local srcre="$1"
        sed -ne "s/^src[[:space:]]\+$srcre[[:space:]]\+//p" < $IPKG_CONF
 ipkg_srcs() {
        local srcre="$1"
        sed -ne "s/^src[[:space:]]\+$srcre[[:space:]]\+//p" < $IPKG_CONF


@@ -43,7 +45,7 @@ ipkg_src_names() {
 
 ipkg_src_byname() {
        local src="$1"
 
 ipkg_src_byname() {
        local src="$1"

-       ipkg_srcs $src | head -1
+       ipkg_srcs $src | head -n 1

 }
 
 ipkg_dests() {
 }
 
 ipkg_dests() {


@@ -68,16 +70,16 @@ ipkg_state_dirs() {
 }
 
 ipkg_dest_default() {
 }
 
 ipkg_dest_default() {

-       ipkg_dests_all | head -1
+       ipkg_dests_all | head -n 1

 }
 
 ipkg_dest_default_name() {
 }
 
 ipkg_dest_default_name() {

-       ipkg_dest_names | head -1
+       ipkg_dest_names | head -n 1

 }
 
 ipkg_dest_byname() {
        local dest="$1"
 }
 
 ipkg_dest_byname() {
        local dest="$1"

-       ipkg_dests $dest | head -1
+       ipkg_dests $dest | head -n 1

 }
 
 ipkg_option() {
 }
 
 ipkg_option() {


@@ -607,8 +609,7 @@ s/ \+/ /g'`
                        ipkg_set_depends $pkg $new_deps
                done
 
                        ipkg_set_depends $pkg $new_deps
                done
 

-               new_deps=`echo $new_deps | sed -e 's/[[:space:]]\+/\\
-/g' | sort | uniq`
+               new_deps=`echo $new_deps | sed -e 's/[[:space:]]\+/\n/g' | sort | uniq`

 
                local maybe_new_pkgs=
                for pkg in $new_deps; do
 
                local maybe_new_pkgs=
                for pkg in $new_deps; do


@@ -924,11 +925,7 @@ ipkg_install() {
                                ipkg_install_file $ipkg_filename
                        ;;
                *.ipk  | *.deb)
                                ipkg_install_file $ipkg_filename
                        ;;
                *.ipk  | *.deb)

-                       if [ -f "$pkg" ]; then

                                ipkg_install_file $pkg
                                ipkg_install_file $pkg

-                       else
-                               echo "File not found $pkg" >&2
-                       fi

                        ;;
                *)
                        ipkg_get_install $pkg || true
                        ;;
                *)
                        ipkg_get_install $pkg || true


@@ -984,7 +981,7 @@ ipkg_install_wanted() {
 
 ipkg_upgrade_pkg() {
        local pkg="$1"
 
 ipkg_upgrade_pkg() {
        local pkg="$1"

-       local avail_ver="`ipkg_info $pkg Version | ipkg_extract_value | head -1`"
+       local avail_ver="`ipkg_info $pkg Version | ipkg_extract_value | head -n 1`"

 
        is_installed=
        for dest_name in `ipkg_dest_names`; do
 
        is_installed=
        for dest_name in `ipkg_dest_names`; do