diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2013-02-08 01:08:51 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2013-02-08 01:08:51 -0200 |
| commit | 1201d13175d748592aea1293f7161c71911f9c6b (patch) | |
| tree | f66dfafbcd9435c1406f08ebc1a80e1787f4e780 | |
| parent | c436bd9aeb41c703a8130381c63cfa6ce8faf361 (diff) | |
| download | metadot-1201d13175d748592aea1293f7161c71911f9c6b.tar.gz metadot-1201d13175d748592aea1293f7161c71911f9c6b.tar.bz2 | |
Commenting out funcoeszz; avoiding bashism; manually setting hostname
| -rw-r--r-- | modules/profile/profile.dot.link | 6 | ||||
| -rwxr-xr-x | modules/profile/xprofile.dot.link | 17 |
2 files changed, 14 insertions, 9 deletions
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 |