Fix BitchX compilation, remove previous declarations of some variables, closes #425

[openwrt.git] / openwrt / scripts / ipkg

diff --git a/openwrt/scripts/ipkg b/openwrt/scripts/ipkg
index efbeb7d..4d3ad85 100755 (executable)
--- a/openwrt/scripts/ipkg
+++ b/openwrt/scripts/ipkg
@@ -43,7 +43,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 +68,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() {


@@ -121,6 +121,8 @@ Valid destinations are directories or one of the dest names from $IPKG_CONF:" >&
                IPKG_TMP=$IPKG_ROOT/tmp/ipkg
        fi
 
                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
 


@@ -605,8 +607,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


@@ -690,8 +691,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


@@ -787,7 +786,7 @@ ipkg_install_file_dest() {
                        echo "Package: $pkg
 Status: install ok pending" | ipkg_status_update_sd $sd $pkg
                        mkdir -p $IPKG_PENDING_DIR
                        echo "Package: $pkg
 Status: install ok pending" | ipkg_status_update_sd $sd $pkg
                        mkdir -p $IPKG_PENDING_DIR

-                       cp $filename $IPKG_PENDING_DIR
+                       cp -f $filename $IPKG_PENDING_DIR

                        rm -r $IPKG_TMP/$pkg/control
                        rm -r $IPKG_TMP/$pkg/data
                        rmdir $IPKG_TMP/$pkg
                        rm -r $IPKG_TMP/$pkg/control
                        rm -r $IPKG_TMP/$pkg/data
                        rmdir $IPKG_TMP/$pkg


@@ -984,7 +983,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