[ar71xx] remove duplicated includes

[openwrt.git] / scripts / ipkg

diff --git a/scripts/ipkg b/scripts/ipkg
index 97a3151..d798bca 100755 (executable)
--- a/scripts/ipkg
+++ b/scripts/ipkg
@@ -116,7 +116,7 @@ Valid destinations are directories or one of the dest names from $IPKG_CONF:" >&
        fi
 
        # Global ipkg state directories
        fi
 
        # Global ipkg state directories

-       IPKG_DIR_PREFIX=usr/lib/ipkg
+       IPKG_DIR_PREFIX=usr/lib/opkg

        IPKG_LISTS_DIR=$IPKG_OFFLINE_ROOT/$IPKG_DIR_PREFIX/lists
        IPKG_PENDING_DIR=$IPKG_OFFLINE_ROOT/$IPKG_DIR_PREFIX/pending
        if [ -z "$IPKG_TMP" ]; then
        IPKG_LISTS_DIR=$IPKG_OFFLINE_ROOT/$IPKG_DIR_PREFIX/lists
        IPKG_PENDING_DIR=$IPKG_OFFLINE_ROOT/$IPKG_DIR_PREFIX/pending
        if [ -z "$IPKG_TMP" ]; then


@@ -146,7 +146,7 @@ Valid destinations are directories or one of the dest names from $IPKG_CONF:" >&
                export no_proxy="$IPKG_NO_PROXY"
        fi
 
                export no_proxy="$IPKG_NO_PROXY"
        fi
 

-       IPKG_STATUS_FIELDS='\(Package\|Status\|Essential\|Version\|Conffiles\|Root\)'
+       IPKG_STATUS_FIELDS='\(Package\|Status\|Essential\|Version\|Conffiles\|Root\|Architecture\)'

 }
 
 ipkg_usage() {
 }
 
 ipkg_usage() {


@@ -234,7 +234,6 @@ ipkg_download() {
                proxyoption="--proxy=on"
        fi
 
                proxyoption="--proxy=on"
        fi
 

-       echo "Downloading $src ..."

        rm -f $IPKG_TMP/$src_file
        case "$src" in
        http://* | ftp://*)
        rm -f $IPKG_TMP/$src_file
        case "$src" in
        http://* | ftp://*)


@@ -252,7 +251,6 @@ ipkg_download() {
                ;;
        esac
 
                ;;
        esac
 

-       echo "Done."

        return 0
 }
 
        return 0
 }
 


@@ -665,7 +663,7 @@ Status: install ok not-installed" | ipkg_status_update_sd $sd $pkg
                        curcheck="`expr $curcheck + 1`"
                        local is_installed="`ipkg_get_installed $pkg`"
                        if [ "$is_installed" = "installed" ]; then
                        curcheck="`expr $curcheck + 1`"
                        local is_installed="`ipkg_get_installed $pkg`"
                        if [ "$is_installed" = "installed" ]; then

-                               echo "$pkg is installed" > /dev/console
+                               echo "$pkg is installed"

                                continue
                        fi
 
                                continue
                        fi
 


@@ -693,7 +691,6 @@ Status: install ok not-installed" | ipkg_status_update_sd $sd $pkg
                                return 1;
                        fi
 
                                return 1;
                        fi
 

-                       echo ""

                        local tmp_pkg_file="$IPKG_TMP/"`ipkg_file_part $filename`
                        if ! ipkg_download `ipkg_src_byname $src`/$filename $tmp_pkg_file; then
                                echo "ipkg_get_install: Perhaps you need to run \`ipkg update'?"
                        local tmp_pkg_file="$IPKG_TMP/"`ipkg_file_part $filename`
                        if ! ipkg_download `ipkg_src_byname $src`/$filename $tmp_pkg_file; then
                                echo "ipkg_get_install: Perhaps you need to run \`ipkg update'?"


@@ -907,7 +904,6 @@ ipkg_install_file() {
 }
 
 ipkg_install() {
 }
 
 ipkg_install() {

-

        while [ $# -gt 0 ]; do
                local pkg="$1"
                shift
        while [ $# -gt 0 ]; do
                local pkg="$1"
                shift