From 9487d403eb41a9018f477a85f6ca2e60aa7f634d Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Sat, 29 Aug 2015 10:45:12 -0300
Subject: Compliance with /bin/sh

---
 bashrc.dot.link     |  2 +-
 geometry.dot.link   |  2 +-
 profile.dot.link    | 20 +++++++++++---------
 xinitrc.dot.link    |  3 +--
 xprofile.dot.link   |  3 +--
 xsessionrc.dot.link |  2 +-
 6 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/bashrc.dot.link b/bashrc.dot.link
index 2c8814c..64afdaa 100644
--- a/bashrc.dot.link
+++ b/bashrc.dot.link
@@ -3,4 +3,4 @@
 #
 
 # Load the profile
-source $HOME/.profile
+. $HOME/.profile
diff --git a/geometry.dot.link b/geometry.dot.link
index 75200c2..e98ca31 100644
--- a/geometry.dot.link
+++ b/geometry.dot.link
@@ -10,5 +10,5 @@ TERM="rxvt"
 
 # Load custom configuration
 if [ -e "$HOME/.custom/geometry" ]; then
-  source $HOME/.custom/geometry
+  . $HOME/.custom/geometry
 fi
diff --git a/profile.dot.link b/profile.dot.link
index ed128ec..ef4c187 100644
--- a/profile.dot.link
+++ b/profile.dot.link
@@ -39,12 +39,14 @@ export EDITOR="vim -X"
 export GIT_PS1_SHOWDIRTYSTATE=""
 export GIT_PS1_SHOWUNTRACKEDFILES=""
 
-# Loaded git completion if needed
-if ! type __git_ps1 2> /dev/null | head -1 | grep -q function; then
-  if [ -e "/etc/bash_completion.d/git-prompt" ]; then
-    source /etc/bash_completion.d/git-prompt
-  elif [ -e "/etc/bash_completion.d/git" ]; then
-    source /etc/bash_completion.d/git
+# Load git completion if needed
+if [ ! -z "$BASH" ]; then
+  if ! type __git_ps1 2> /dev/null | head -1 | grep -q function; then
+    if [ -e "/etc/bash_completion.d/git-prompt" ]; then
+      . /etc/bash_completion.d/git-prompt
+    elif [ -e "/etc/bash_completion.d/git" ]; then
+      . /etc/bash_completion.d/git
+    fi
   fi
 fi
 
@@ -68,11 +70,11 @@ if [ -e "$HOME/.ssh/id_rsa" ]; then
   /usr/bin/keychain -q $HOME/.ssh/id_rsa
 
   if [ -e "$HOME/.keychain/$HOSTNAME-sh" ]; then
-    source $HOME/.keychain/$HOSTNAME-sh
+    . $HOME/.keychain/$HOSTNAME-sh
   fi
 
   if [ -e "$HOME/.keychain/$HOSTNAME-sh-gpg" ]; then
-    source $HOME/.keychain/$HOSTNAME-sh-gpg
+    . $HOME/.keychain/$HOSTNAME-sh-gpg
   fi
 
   #if [ -e "$HOME/apps/scripts/ssh-agent-eval" ]; then
@@ -122,7 +124,7 @@ fi
 if [ -n "$BASH_VERSION" ]; then
   # Command prompt if no system-wide custom prompt is available
   if ! type command_prompt &> /dev/null && [ -e "$HOME/apps/bash-prompt/prompt" ]; then
-    source $HOME/apps/bash-prompt/prompt
+    . $HOME/apps/bash-prompt/prompt
   fi
 fi
 
diff --git a/xinitrc.dot.link b/xinitrc.dot.link
index dacd106..983ceff 100644
--- a/xinitrc.dot.link
+++ b/xinitrc.dot.link
@@ -1,10 +1,9 @@
-#!/bin/bash
 #
 # .xinitrc: set basic X11 environment for non-X11 runlevel
 #
 
 # Load .xprofile
-source $HOME/.xprofile &
+#. $HOME/.xprofile &
 
 # Run window manager
 #awesome
diff --git a/xprofile.dot.link b/xprofile.dot.link
index 91c86d4..9cdad53 100644
--- a/xprofile.dot.link
+++ b/xprofile.dot.link
@@ -1,10 +1,9 @@
-#!/bin/bash
 #
 # .xprofile: set basic X11 environment
 #
 
 # Load .xprofile
-#source $HOME/.xprofile &
+#. $HOME/.xprofile &
 
 # Run window manager
 #awesome
diff --git a/xsessionrc.dot.link b/xsessionrc.dot.link
index 2221fd5..930878d 100755
--- a/xsessionrc.dot.link
+++ b/xsessionrc.dot.link
@@ -29,7 +29,7 @@ if [ -e "$HOME/.custom/xsession" ]; then
 fi
 
 # Set background
-if [ "$BACKGROUND" == "all" ]; then
+if [ "$BACKGROUND" = "all" ]; then
   feh --bg-scale --randomize $HOME/.config/themes/backgrounds/*
 elif [ ! -z "$BACKGROUND" ] && [ "$BACKGROUND" != "unset" ]; then
   #Esetroot -scale $HOME/.config/themes/backgrounds/$BACKGROUND
-- 
cgit v1.2.3