This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project wmaker-crm.git.
The branch, next has been updated
via bc3d35fc3cadc01f43a78ae7047a1d3e0e1f79fd (commit)
from c3875da8d63ed4eb8a68ae52eba905629adbb9bd (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://repo.or.cz/w/wmaker-crm.git/commit/bc3d35fc3cadc01f43a78ae7047a1d3e0e1f79fd
commit bc3d35fc3cadc01f43a78ae7047a1d3e0e1f79fd
Author: Carlos R. Mafra <[email protected]>
Date: Sat Aug 6 15:49:35 2011 +0200
Use wmgenmenu to create WMRootMenu during installation
Instead of using _old_ and hard-coded predefined menus as the
source for the user's WMRootMenu during installation, generate
the menu automatically using wmgenmenu.
Signed-off-by: Carlos R. Mafra <[email protected]>
diff --git a/util/wmaker.inst.in b/util/wmaker.inst.in
index 2acbbd6..6257a54 100644
--- a/util/wmaker.inst.in
+++ b/util/wmaker.inst.in
@@ -61,24 +61,6 @@ copy() {
rm -f "$target"
if [ "$file" = "WindowMaker" ]; then
sed -e "s|~/GNUstep|$GSDIR|g" "$source" > "$target"
- elif [ "$file" = "WMRootMenu" ]; then
- if [ "$LOCALE" ]; then
- if [ -f "$GLOBALDIR/plmenu.$LOCALE" ]; then
- source="$GLOBALDIR/plmenu.$LOCALE"
- elif [ -f "$GLOBALDIR/plmenu.${LOCALE%.*}" ]; then
- source="$GLOBALDIR/plmenu.${LOCALE%.*}"
- elif [ -f "$GLOBALDIR/plmenu.${LOCALE%_*}" ]; then
- source="$GLOBALDIR/plmenu.${LOCALE%_*}"
- elif [ -f "$GLOBALDIR/menu.${LOCALE%_*}" ]; then
- source="$GLOBALDIR/menu.${LOCALE%_*}"
- else
- source="$GLOBALDIR/plmenu"
- fi
- else
- source="$GLOBALDIR/plmenu"
- fi
- sed -e "s:#wmdatadir#:$GLOBALDIR:g" -
"$source" > "$GSDIR/Defaults/WMRootMenu"
else
if test "x$GNUSTEP_USER_ROOT" = "x"; then
sed -e "s:#wmdatadir#:$GLOBALDIR:g" @@ -91,7 +73,12 @@
copy() {
fi
}
-
+#
+# Generate WMRootmenu
+#
+GenerateMenu() {
+ wmgenmenu > $GSDIR/Defaults/WMRootMenu
+}
echo "Installing WindowMaker $VERSION for current user..."
@@ -160,6 +147,7 @@ for i in $FILES; do
fi
done
+ GenerateMenu
if [ ! -d "$GSDIR/Library/Icons/" ]; then
echo "Creating icon library directory $GSDIR/Library/Icons"
-----------------------------------------------------------------------
Summary of changes:
util/wmaker.inst.in | 26 +++++++-------------------
1 files changed, 7 insertions(+), 19 deletions(-)
repo.or.cz automatic notification. Contact project admin [email protected]
if you want to unsubscribe, or site admin [email protected] if you receive
no reply.
--
wmaker-crm.git ("Fork from the last available CVS version of Window Maker")
--
To unsubscribe, send mail to [email protected].
