X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/e46aa6fbddf54d8da50a9286826fd38776be221c..e1ee35b052206f8880a3cc843d17a22f68fb5ff2:/scripts/ipkg?ds=sidebyside diff --git a/scripts/ipkg b/scripts/ipkg index 4d3ad8506..311f3abdb 100755 --- a/scripts/ipkg +++ b/scripts/ipkg @@ -32,6 +32,8 @@ ipkg_is_upgrade () { 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 @@ -232,7 +234,6 @@ ipkg_download() { proxyoption="--proxy=on" fi - echo "Downloading $src ..." rm -f $IPKG_TMP/$src_file case "$src" in http://* | ftp://*) @@ -250,7 +251,6 @@ ipkg_download() { ;; esac - echo "Done." return 0 } @@ -663,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 - echo "$pkg is installed" > /dev/console + echo "$pkg is installed" continue fi @@ -691,7 +691,6 @@ Status: install ok not-installed" | ipkg_status_update_sd $sd $pkg 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'?" @@ -905,7 +904,6 @@ ipkg_install_file() { } ipkg_install() { - while [ $# -gt 0 ]; do local pkg="$1" shift @@ -923,11 +921,7 @@ ipkg_install() { ipkg_install_file $ipkg_filename ;; *.ipk | *.deb) - if [ -f "$pkg" ]; then ipkg_install_file $pkg - else - echo "File not found $pkg" >&2 - fi ;; *) ipkg_get_install $pkg || true