|
Check-in Number:
|
4391 | |
| Date: |
2004-Jan-21 21:40:51 (local)
2004-Jan-21 20:40:51 (UTC) |
| User: | rse |
| Branch: | |
| Comment: |
fix bug in concise formatting and change redhat and fedora naming |
| Tickets: |
|
| Inspections: |
|
| Files: |
|
ossp-pkg/shtool/sh.platform 1.3 -> 1.4
--- sh.platform 2004/01/01 16:54:20 1.3
+++ sh.platform 2004/01/21 20:40:51 1.4
@@ -227,29 +227,28 @@
-e 's/^#[^0-9]*\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/' \
-e 's/^#[^0-9]*\([0-9][0-9]*\).*$/\1/' \
-e 's/^#.*$//'`
- t=""
- if [ ".${n}" = .redhat ]; then
- t=`head -1 /etc/${tagfile} | \
- sed -e 's/^/#/' \
- -e 's/^#.*Red Hat Enterprise Linux \([AEW]S\).*$/\1/' \
- -e 's/^#.*$//'`
- fi
case "`util_lower ${n}`" in
- debian ) n="Debian[ GNU/Linux]" ;;
- fedora ) n="Fedora[ GNU/Linux]" ;;
- redhat ) n="RedHat[ Linux]" ;;
- suse ) n="SuSE[ Linux]" ;;
- mandrake ) n="Mandrake[ Linux]" ;;
- gentoo ) n="Gentoo[ Linux]" ;;
- slackware ) n="Slackware[ Linux]" ;;
- turbolinux ) n="TurboLinux" ;;
- unitedlinux ) n="UnitedLinux" ;;
- * ) n="${n}[ GNU/Linux]" ;;
+ redhat )
+ if [ ".`grep 'Red Hat Enterprise Linux' /etc/${tagfile}`" != . ]; then
+ n="<R>ed <H>at <E>nterprise <L>inux"
+ else
+ n="<R>ed <H>at <L>inux"
+ fi
+ ;;
+ debian ) n="Debian[ GNU/Linux]" ;;
+ fedora ) n="<Fedora> Core[ GNU/Linux]" ;;
+ suse ) n="SuSE[ Linux]" ;;
+ mandrake ) n="Mandrake[ Linux]" ;;
+ gentoo ) n="Gentoo[ GNU/Linux]" ;;
+ slackware ) n="Slackware[ Linux]" ;;
+ turbolinux ) n="TurboLinux" ;;
+ unitedlinux ) n="UnitedLinux" ;;
+ * ) n="${n}[ GNU/Linux]" ;;
+ esac
+ case "$n" in
+ *"<"*">"* ) SP="$n <$v>" ;;
+ * ) SP="$n $v" ;;
esac
- if [ ".${t}" != . ]; then
- n="${n} ${t}"
- fi
- SP="$n $v"
break
done
fi
@@ -517,7 +516,7 @@
val_C=`echo ":$val" | \
sed -e 's/^://' \
-e 's;\[\([^]]*\)\];;g' \
- -e 's;[^<]*<\([^>]*\)>;\1;g' \
+ -e 's;[^<]*<\([^>]*\)>[^<]*;\1;g' \
-e "s; ;§§;g" \
-e "s;/;%%;g" \
-e "s;§§;${opt_S};g" \
|
|
