add Wi-viz

[openwrt.git] / openwrt / scripts / ipkg

diff --git a/openwrt/scripts/ipkg b/openwrt/scripts/ipkg
index dd44dd6..6cd1cb4 100755 (executable)
--- a/openwrt/scripts/ipkg
+++ b/openwrt/scripts/ipkg
@@ -117,7 +117,11 @@ Valid destinations are directories or one of the dest names from $IPKG_CONF:" >&
        IPKG_DIR_PREFIX=usr/lib/ipkg
        IPKG_LISTS_DIR=$IPKG_OFFLINE_ROOT/$IPKG_DIR_PREFIX/lists
        IPKG_PENDING_DIR=$IPKG_OFFLINE_ROOT/$IPKG_DIR_PREFIX/pending
        IPKG_DIR_PREFIX=usr/lib/ipkg
        IPKG_LISTS_DIR=$IPKG_OFFLINE_ROOT/$IPKG_DIR_PREFIX/lists
        IPKG_PENDING_DIR=$IPKG_OFFLINE_ROOT/$IPKG_DIR_PREFIX/pending

-       IPKG_TMP=$IPKG_ROOT/tmp/ipkg
+       if [ -z "$IPKG_TMP" ]; then
+               IPKG_TMP=$IPKG_ROOT/tmp/ipkg
+       fi
+
+       [ -e "$IPKG_TMP" ] || mkdir -p $IPKG_TMP

 
        # Destination specific ipkg meta-data directory
        IPKG_STATE_DIR=$IPKG_ROOT/$IPKG_DIR_PREFIX
 
        # Destination specific ipkg meta-data directory
        IPKG_STATE_DIR=$IPKG_ROOT/$IPKG_DIR_PREFIX


@@ -546,20 +550,20 @@ ipkg_set_depends() {
        local new_deps="$*"
        pkg="`ipkg_safe_pkg_name $pkg`"
        ## setvar ${pkg}_depends "$new_deps"
        local new_deps="$*"
        pkg="`ipkg_safe_pkg_name $pkg`"
        ## setvar ${pkg}_depends "$new_deps"

-       echo $new_deps > /tmp/ipkg/${pkg}.depends
+       echo $new_deps > $IPKG_TMP/${pkg}.depends

 }
 
 ipkg_get_depends() {
        local pkg=$1
        pkg="`ipkg_safe_pkg_name $pkg`"
 }
 
 ipkg_get_depends() {
        local pkg=$1
        pkg="`ipkg_safe_pkg_name $pkg`"

-       cat /tmp/ipkg/${pkg}.depends
+       cat $IPKG_TMP/${pkg}.depends

        ## eval "echo \$${pkg}_depends"
 }
 
 ipkg_set_installed() {
        local pkg=$1
        pkg="`ipkg_safe_pkg_name $pkg`"
        ## eval "echo \$${pkg}_depends"
 }
 
 ipkg_set_installed() {
        local pkg=$1
        pkg="`ipkg_safe_pkg_name $pkg`"

-       echo installed > /tmp/ipkg/${pkg}.installed
+       echo installed > $IPKG_TMP/${pkg}.installed

        ## setvar ${pkg}_installed "installed"
 }
 
        ## setvar ${pkg}_installed "installed"
 }
 


@@ -567,15 +571,15 @@ ipkg_set_uninstalled() {
        local pkg=$1
        pkg="`ipkg_safe_pkg_name $pkg`"
        ### echo ipkg_set_uninstalled $pkg > /dev/console
        local pkg=$1
        pkg="`ipkg_safe_pkg_name $pkg`"
        ### echo ipkg_set_uninstalled $pkg > /dev/console

-       echo uninstalled > /tmp/ipkg/${pkg}.installed
+       echo uninstalled > $IPKG_TMP/${pkg}.installed

        ## setvar ${pkg}_installed "uninstalled"
 }
 
 ipkg_get_installed() {
        local pkg=$1
        pkg="`ipkg_safe_pkg_name $pkg`"
        ## setvar ${pkg}_installed "uninstalled"
 }
 
 ipkg_get_installed() {
        local pkg=$1
        pkg="`ipkg_safe_pkg_name $pkg`"

-       if [ -f /tmp/ipkg/${pkg}.installed ]; then
-               cat /tmp/ipkg/${pkg}.installed
+       if [ -f $IPKG_TMP/${pkg}.installed ]; then
+               cat $IPKG_TMP/${pkg}.installed

        fi
        ## eval "echo \$${pkg}_installed"
 }
        fi
        ## eval "echo \$${pkg}_installed"
 }


@@ -688,8 +692,6 @@ Status: install ok not-installed" | ipkg_status_update_sd $sd $pkg
                                return 1;
                        fi
 
                                return 1;
                        fi
 

-                       [ -e "$IPKG_TMP" ] || mkdir -p $IPKG_TMP
-

                        echo ""
                        local tmp_pkg_file="$IPKG_TMP/"`ipkg_file_part $filename`
                        if ! ipkg_download `ipkg_src_byname $src`/$filename $tmp_pkg_file; then
                        echo ""
                        local tmp_pkg_file="$IPKG_TMP/"`ipkg_file_part $filename`
                        if ! ipkg_download `ipkg_src_byname $src`/$filename $tmp_pkg_file; then