From 1201d13175d748592aea1293f7161c71911f9c6b Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Fri, 8 Feb 2013 01:08:51 -0200
Subject: Commenting out funcoeszz; avoiding bashism; manually setting hostname

---
 modules/profile/profile.dot.link  |  6 +++---
 modules/profile/xprofile.dot.link | 17 +++++++++++------
 2 files changed, 14 insertions(+), 9 deletions(-)

(limited to 'modules/profile')

diff --git a/modules/profile/profile.dot.link b/modules/profile/profile.dot.link
index 9c2bc47..3b71de0 100644
--- a/modules/profile/profile.dot.link
+++ b/modules/profile/profile.dot.link
@@ -11,9 +11,9 @@ if [ -e "$HOME/.aliases" ]; then
 fi
 
 # Funcoes ZZ
-if [ -e "/usr/bin/funcoeszz" ]; then
-  . /usr/bin/funcoeszz
-fi
+#if [ -e "/usr/bin/funcoeszz" ]; then
+#  . /usr/bin/funcoeszz
+#fi
 
 # Set PATH
 PATH=$PATH:/sbin:/usr/sbin:/usr/local/sbin
diff --git a/modules/profile/xprofile.dot.link b/modules/profile/xprofile.dot.link
index b679ed4..7de56ea 100755
--- a/modules/profile/xprofile.dot.link
+++ b/modules/profile/xprofile.dot.link
@@ -12,6 +12,9 @@ PROGRAMS=""
 # OS Version
 OSVERSION="`cut -d . -f 1 /etc/debian_version`"
 
+# Hostname
+HOSTNAME="`cat /etc/hostname`"
+
 # Make sure to load the profile
 . $HOME/.profile
 
@@ -42,17 +45,19 @@ for program in $PROGRAMS; do
   $program &
 done
 
-# See https://bugzilla.redhat.com/show_bug.cgi?id=783568
-#     https://bugs.launchpad.net/ubuntu/+source/gnome-keyring/+bug/932177
-unset GNOME_KEYRING_PID
-unset GNOME_KEYRING_CONTROL
-
 # Apply custom keyboard configuration
 if [ -f "$HOME/.Xmodmaps/$HOSTNAME" ]; then
   xmodmap $HOME/.Xmodmaps/$HOSTNAME
 fi
 
 # Execute window manager
-if [ "$OSVERSION" == '7' ]; then
+if [ "$OSVERSION" = "7" ]; then
+  # See https://bugzilla.redhat.com/show_bug.cgi?id=783568
+  #     https://bugs.launchpad.net/ubuntu/+source/gnome-keyring/+bug/932177
+  #unset GNOME_KEYRING_PID
+  #unset GNOME_KEYRING_CONTROL
+  #eval $(gnome-keyring-daemon --start) &
+
+  # Start window manager
   awesome
 fi
-- 
cgit v1.2.3