things

3 files changed, 15 insertions, 58 deletions

diff --git a/Common/bashrc.m4 b/Common/bashrc.m4
index 6b5b65e..344be63 100644
--- a/Common/bashrc.m4
+++ b/Common/bashrc.m4
@@ -1,8 +1,4 @@
 m4_include(`system.m4')m4_dnl
-# ~/.bashrc: executed by bash(1) for non-login shells.
-# see /usr/share/doc/bash/examples/startup-files (in the package bash-doc)
-# for examples
-
 # If not running interactively, don't do anything
 case $- in
     *i*) ;;
@@ -39,68 +35,18 @@ HISTCONTROL=ignoreboth
 # append to the history file, don't overwrite it
 shopt -s histappend
 
-# for setting history length see HISTSIZE and HISTFILESIZE in bash(1)
-HISTSIZE=1000
-HISTFILESIZE=2000
-
 # check the window size after each command and, if necessary,
 # update the values of LINES and COLUMNS.
 shopt -s checkwinsize
 
-# If set, the pattern "**" used in a pathname expansion context will
-# match all files and zero or more directories and subdirectories.
-#shopt -s globstar
-
 # Prompt
 PS1='\w\$ '
 
-# enable color support of ls and also add handy aliases
-if [ -x /usr/bin/dircolors ]; then
-    test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)"
-    alias ls='ls --color=auto'
-    alias ll='ls -l --color=auto'
-    alias la='ls -A --color=auto'
-
-    alias grep='grep --color=auto'
-    alias fgrep='fgrep --color=auto'
-    alias egrep='egrep --color=auto'
-fi
-
-# man pages in colors
-man() {
-    LESS_TERMCAP_md=$'\e[01;31m' \
-    LESS_TERMCAP_me=$'\e[0m' \
-    LESS_TERMCAP_se=$'\e[0m' \
-    LESS_TERMCAP_so=$'\e[01;44;33m' \
-    LESS_TERMCAP_ue=$'\e[0m' \
-    LESS_TERMCAP_us=$'\e[01;32m' \
-    command man "$@"
-}
-
-# colored GCC warnings and errors
-#export GCC_COLORS='error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01'
-
-# Alias definitions.
-# You may want to put all your additions into a separate file like
-# ~/.bash_aliases, instead of adding them here directly.
-# See /usr/share/doc/bash-doc/examples in the bash-doc package.
-
 if [ -f ~/.bash_aliases ]; then
     . ~/.bash_aliases
 fi
 alias cda=". $HOME/bin/cd-archive"
 
-# enable programmable completion features (you don't need to enable
-# this, if it's already enabled in /etc/bash.bashrc and /etc/profile
-# sources /etc/bash.bashrc).
-if ! shopt -oq posix; then
-  if [ -f /usr/share/bash-completion/bash_completion ]; then
-    . /usr/share/bash-completion/bash_completion
-  elif [ -f /etc/bash_completion ]; then
-    . /etc/bash_completion
-  fi
-fi
-
 # Make tmux window title show the ssh hostname
 # Make short hostname only if its not an IP address
 __tm_get_hostname(){
diff --git a/bin/pingme.m4 b/bin/pingme.m4
index 5eea292..1bb2feb 100644
--- a/bin/pingme.m4
+++ b/bin/pingme.m4
@@ -13,3 +13,6 @@ tmux display-message "${MESSAGE}"
 m4_ifelse(DT_GOTIFY_URL, `', `', `m4_dnl
 GOTIFY_RES=$(curl "$GOTIFY_URL" -F "title=Pingme" -F "message=$MESSAGE" -F "priority=5" 2> /dev/null)
 ')m4_dnl
+m4_ifelse(DT_DOTFILES_TYPE, `local', `m4_dnl
+notify-send "$MESSAGE"
+')m4_dnl
diff --git a/bin/sqlwait b/bin/sqlwait
index 6d472a9..5e7398c 100755
--- a/bin/sqlwait
+++ b/bin/sqlwait
@@ -1,6 +1,6 @@
 #!/bin/sh
-set -e
 
+SLEEP=10
 PRINT_FLAG=false
 MYSQL_HOST="localhost"
 COMPARE_TYPE="eq"
@@ -76,11 +76,17 @@ if [ -z "$MYSQL_DATABASE" ]; then
   exit 1
 fi
 
-read -s -p "Enter password: " MYSQL_PASSWORD
+read -s -p "Enter password: " MYSQL_PWD
 echo
+export MYSQL_PWD
 
 while true; do
-    RESULT=$(mysql -u"$MYSQL_USER" -p"$MYSQL_PASSWORD" -h"$MYSQL_HOST" "$MYSQL_DATABASE" -e "$QUERY" --batch --silent 2> /dev/null)
+    RESULT=$(mysql -u"$MYSQL_USER"  -h"$MYSQL_HOST" "$MYSQL_DATABASE" -e "$QUERY" --batch --silent)
+    if [ ! "$?" = "0" ]; then
+        >&2 echo "[$(date)]: MySQL Error!"
+        sleep $SLEEP
+        continue
+    fi
     if [ "$PRINT_FLAG" = true ]; then
         echo "[$(date)]: ${RESULT}"
     fi
@@ -108,6 +114,8 @@ while true; do
         fi
     fi
 
-    sleep 10
+    sleep $SLEEP
 done
 
+unset MYSQL_PWD
+