From f907777709b20d8d73e3587026296a6616262229 Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Sun, 31 Dec 2006 13:13:53 +0000 Subject: remove extra whitespace at end-of-line in about 900 bb files. --- packages/images/opie-image.bb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'packages/images/opie-image.bb') diff --git a/packages/images/opie-image.bb b/packages/images/opie-image.bb index e22200abc5..172e4111aa 100644 --- a/packages/images/opie-image.bb +++ b/packages/images/opie-image.bb @@ -30,11 +30,11 @@ merge_feeds() { echo "[${IMAGE_ROOTFS}/etc/ipkg.conf] is missing!" exit 1 fi - + # comment out existing feed-sources inserted by ipkg-collateral cat ${IMAGE_ROOTFS}/etc/ipkg.conf | sed "s/^src\ /#src\ /" > ${IMAGE_ROOTFS}/etc/ipkg.conf_ rm ${IMAGE_ROOTFS}/etc/ipkg.conf && mv ${IMAGE_ROOTFS}/etc/ipkg.conf_ ${IMAGE_ROOTFS}/etc/ipkg.conf - + # extract, then delete destinations cat ${IMAGE_ROOTFS}/etc/ipkg.conf | egrep "^dest\ " > ${IMAGE_ROOTFS}/etc/ipkg.conf.dest cat ${IMAGE_ROOTFS}/etc/ipkg.conf | egrep -v "^dest\ " > ${IMAGE_ROOTFS}/etc/ipkg.conf_ @@ -46,19 +46,19 @@ merge_feeds() { # strip leading and trailing spaces/tabs, then split into name and uri line_clean="`echo "$line"|sed 's/^[ \t]*//;s/[ \t]*$//'`" feed_name="`echo "$line_clean" | sed -n 's/\(.*\)##\(.*\)/\1/p'`" - feed_uri="`echo "$line_clean" | sed -n 's/\(.*\)##\(.*\)/\2/p'`" + feed_uri="`echo "$line_clean" | sed -n 's/\(.*\)##\(.*\)/\2/p'`" # insert new feed-sources echo "src/gz $feed_name $feed_uri" >> ${IMAGE_ROOTFS}/etc/ipkg.conf done - + # remove temporary files and rebuild ipkg.conf echo "" >> ${IMAGE_ROOTFS}/etc/ipkg.conf cat ${IMAGE_ROOTFS}/etc/ipkg.conf.dest >> ${IMAGE_ROOTFS}/etc/ipkg.conf rm ${IMAGE_ROOTFS}/etc/ipkg.conf.dest - + # remove -feed.conf files which are no longer needed - cd ${IMAGE_ROOTFS}/etc/ipkg/ && rm -- *-feed.conf + cd ${IMAGE_ROOTFS}/etc/ipkg/ && rm -- *-feed.conf fi } -- cgit v1.2.3