X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=openwrt%2Fscripts%2Fipkg;h=4d3ad850651aeed6abd4e82697061048a1d878f7;hb=b5d886dade07591079c5fab06d574e06530aee30;hp=6cd1cb440ae05f18eda675639b919cdea210299d;hpb=8245d8b3fcddf6646eb4e29a27c19ed117991c30;p=openwrt.git

diff --git a/openwrt/scripts/ipkg b/openwrt/scripts/ipkg
index 6cd1cb440a..4d3ad85065 100755
--- a/openwrt/scripts/ipkg
+++ b/openwrt/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
@@ -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
-			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
@@ -984,7 +983,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