|
|
@@ -71,13 +71,13 @@ tag=""
|
|
|
if [ ".$opt_r" != . ]; then
|
|
|
tag=`echo ".$opt_r" | sed -e 's;^\.;;' | number_to_tag`
|
|
|
elif [ -f "$prefix/etc/openpkg/release" ]; then
|
|
|
- tag=`sed <$prefix/etc/openpkg/release \
|
|
|
+ tag=`(cat $prefix/etc/openpkg/release; echo "") | sed \
|
|
|
-e 's;^;X;' \
|
|
|
-e 's;^X *TAG *= *\([^ ][^ ]*\).*;\1;' \
|
|
|
-e '/^X/d'`
|
|
|
else
|
|
|
tag=`$prefix/bin/openpkg rpm \
|
|
|
- -q --qf '%{VERSION}' openpkg | number_to_tag`
|
|
|
+ -q --qf '%{VERSION}\n' openpkg | number_to_tag`
|
|
|
fi
|
|
|
if [ .`echo ".$tag" | sed -e 's;^\.;;' | tag_sanity` = .ERROR ]; then
|
|
|
echo "openpkg:release: WARNING: unable to determine OpenPKG release tag" 1>&2
|
|
|
@@ -87,7 +87,7 @@ fi
|
|
|
# determine distribution URL
|
|
|
url=""
|
|
|
if [ -f "$prefix/etc/openpkg/release" ]; then
|
|
|
- url=`sed <$prefix/etc/openpkg/release \
|
|
|
+ url=`(cat $prefix/etc/openpkg/release; echo "") | sed \
|
|
|
-e 's;^;X;' \
|
|
|
-e 's;^X *URL *= *\([^ ][^ ]*\).*;\1;' \
|
|
|
-e '/^X/d'`
|