fix a few warnings

1 files changed, 30 insertions, 18 deletions

diff --git a/skel/.zprofile b/skel/.zprofile
index 6ef90ae..9af47e3 100644
--- a/skel/.zprofile
+++ b/skel/.zprofile
@@ -1,31 +1,43 @@
 LANG='en_US.UTF-8'; export LANG
-LC_TIME='de_AT.UTF-8'; export LC_TIME
-LC_MONETARY='de_AT.UTF-8'; export LC_MONETARY
+if [[ -x /usr/bin/locale ]]; then
+	if /usr/bin/locale -a | grep -q de_AT.utf8; then
+		LC_TIME='de_AT.UTF-8'; export LC_TIME
+		LC_MONETARY='de_AT.UTF-8'; export LC_MONETARY
+	elif locale -a | grep -q de_DE.utf8; then
+		LC_TIME='de_DE.UTF-8'; export LC_TIME
+		LC_MONETARY='de_DE.UTF-8'; export LC_MONETARY
+	fi
+fi
+
 LIBGL_DRI3_DISABLE=1; export LIBGL_DRI3_DISABLE
 
 SSH_ENV="$HOME/.ssh/environment"
 
 function start_agent {
-    echo "Initialising new SSH agent..."
-    /usr/bin/ssh-agent | sed 's/^echo/#echo/' > "${SSH_ENV}"
-    chmod 600 "${SSH_ENV}"
-    . "${SSH_ENV}" > /dev/null
-	for i in $(ls ~/.ssh/id_* | egrep -v ".pub$"); do
-		 /usr/bin/ssh-add $i
-	done
+	echo "Initialising new SSH agent..."
+	/usr/bin/ssh-agent | sed 's/^echo/#echo/' > "${SSH_ENV}"
+	chmod 600 "${SSH_ENV}"
+	. "${SSH_ENV}" > /dev/null
+	if [[ -x /usr/bin/ssh-add ]]; then
+		for key in $(find ${HOME}/.ssh/ -name 'id_*' | egrep -v '.pub$'); do
+			/usr/bin/ssh-add $key
+		done
+	fi
 }
 
 # Source SSH settings, if applicable
-if [ -f "${SSH_ENV}" ]; then
-     ps -ef | grep ${SSH_AGENT_PID} | grep ssh-agent$ > /dev/null || {
-         start_agent;
-     }
-     . "${SSH_ENV}" > /dev/null
+if [[ -f "${SSH_ENV}" ]]; then
+	ps -ef | grep ${SSH_AGENT_PID} | grep ssh-agent$ > /dev/null || {
+		start_agent;
+	}
+	. "${SSH_ENV}" > /dev/null
 else
-     start_agent;
+	start_agent;
 fi
 
-cmp -s $HOME/.hushlogin /etc/motd
-if [ $? != 0 ]; then
-	tee $HOME/.hushlogin < /etc/motd
+if [[ -r /etc/motd ]]; then
+	cmp -s $HOME/.hushlogin /etc/motd
+	if [ $? != 0 ]; then
+		tee $HOME/.hushlogin < /etc/motd
+	fi
 fi