X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/82daa5e9c007b2a16aa9e8c5526fd8d034ee4541..6ab92cab84ccfa359f400cd6e4fa82f12c8e4bfe:/scripts/ipkg?ds=sidebyside diff --git a/scripts/ipkg b/scripts/ipkg index 7ceaeff69..57e4457cc 100755 --- a/scripts/ipkg +++ b/scripts/ipkg @@ -43,7 +43,7 @@ ipkg_src_names() { ipkg_src_byname() { local src="$1" - ipkg_srcs $src | head -1 + ipkg_srcs $src | head -n 1 } ipkg_dests() { @@ -68,16 +68,16 @@ ipkg_state_dirs() { } ipkg_dest_default() { - ipkg_dests_all | head -1 + ipkg_dests_all | head -n 1 } ipkg_dest_default_name() { - ipkg_dest_names | head -1 + ipkg_dest_names | head -n 1 } ipkg_dest_byname() { local dest="$1" - ipkg_dests $dest | head -1 + ipkg_dests $dest | head -n 1 } ipkg_option() { @@ -607,8 +607,7 @@ s/ \+/ /g'` 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 @@ -924,11 +923,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 @@ -984,7 +979,7 @@ ipkg_install_wanted() { 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