summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatías Fonzo <[email protected]>2020-02-12 17:23:13 -0300
committerMichele Calgaro <[email protected]>2020-02-15 12:39:25 +0900
commit3028fcd62596df7b2c7db1bd5865c8ebdcf9b0ad (patch)
tree8edaf4b29ae8903a62da66f999b4fde0e56bb061
parent26440e41ac76ae6ab7379478e32373662772b44d (diff)
downloadtdebase-3028fcd62596df7b2c7db1bd5865c8ebdcf9b0ad.tar.gz
tdebase-3028fcd62596df7b2c7db1bd5865c8ebdcf9b0ad.zip
release_notes: Use the same method to get the release version (as starttde), minor adjustments
Signed-off-by: Matías Fonzo <[email protected]> (cherry picked from commit ed1d5dea33cdf66686429c96d3926d9c63b4ebe4)
-rw-r--r--release_notes16
1 files changed, 8 insertions, 8 deletions
diff --git a/release_notes b/release_notes
index 9d89732c9..bffb9f453 100644
--- a/release_notes
+++ b/release_notes
@@ -17,19 +17,19 @@ if [ "$TDEDIR" = "" ] || [ "$TDEHOME" = "" ]; then
exit 1
fi
-RELEASE_VERSION=`$TDEDIR/bin/tde-config --version | grep TDE: | awk '{print $2}'`
-RELEASE_NOTES=`$TDEDIR/bin/kreadconfig --file $TDEHOME/share/config/kdeglobals --group "Release Notes" --key "$RELEASE_VERSION"`
+RELEASE_VERSION="$( ${TDEDIR}/bin/tde-config --version | sed -n 's|^TDE: ||p' )"
+RELEASE_NOTES="$( ${TDEDIR}/bin/kreadconfig --file ${TDEHOME}/share/config/kdeglobals --group "Release Notes" --key "$RELEASE_VERSION" )"
+
if [ "$RELEASE_NOTES" = "" ] || [ "$RELEASE_NOTES" != "true" ]; then
echo "[release_notes] Release version: $RELEASE_VERSION"
echo "[release_notes] Release notes: $RELEASE_NOTES"
- $TDEDIR/bin/khelpcenter help:/khelpcenter/releasenotes
- if [ "$?" = "0" ]; then
- $TDEDIR/bin/kwriteconfig --file $TDEHOME/share/config/kdeglobals --group "Release Notes" --key "$RELEASE_VERSION" --type bool "true"
+ if ${TDEDIR}/bin/khelpcenter help:/khelpcenter/releasenotes ; then
+ ${TDEDIR}/bin/kwriteconfig --file ${TDEHOME}/share/config/kdeglobals --group "Release Notes" --key "$RELEASE_VERSION" --type bool "true"
fi
- RELEASE_NOTES=`$TDEDIR/bin/kreadconfig --file $TDEHOME/share/config/kdeglobals --group "Release Notes" --key "$RELEASE_VERSION"`
+ RELEASE_NOTES="$( ${TDEDIR}/bin/kreadconfig --file ${TDEHOME}/share/config/kdeglobals --group "Release Notes" --key "$RELEASE_VERSION" )"
echo "[release_notes] Release notes: $RELEASE_NOTES"
fi
-unset RELEASE_NOTES
-unset RELEASE_VERSION
+unset RELEASE_NOTES RELEASE_VERSION
exit 0
+