X-Git-Url: https://git.jankratochvil.net/?a=blobdiff_plain;f=.bashrc;h=65333749c73bc0cece546d54c8aecfe757b8868f;hb=HEAD;hp=2bd97fb7943faa8fa94e14e5571b90b8889c7768;hpb=c5bb072adf2104b0096ff8c08b1d1184ce86aacf;p=nethome.git

diff --git a/.bashrc b/.bashrc
index 2bd97fb..82e5139 100644
--- a/.bashrc
+++ b/.bashrc
@@ -128,8 +128,13 @@ unalias 2>/dev/null fgrep	# /etc/profile.d/colorgrep.sh
 # `eval':
 eval '
 	function grep {(unset grep; ( ulimitme; grep "$@"; ); );}
-	function ls {(unset ls; ( ls -bF "$@"; ); );}
-	function l { ls -lbF "$@"; }
+	if ls -d -bF / &>/dev/null;then
+		function ls {(unset ls; ( ls -bF "$@"; ); );}
+	else
+		# Alpine Linux
+		function ls {(unset ls; ( ls "$@"; ); );}
+	fi
+	function l { ls -l "$@"; }
 	if which vim &>/dev/null;then
 		alias vi="vim"
 	else
@@ -209,8 +214,11 @@ export HISTSIZE=10000000
 export HISTFILESIZE="$HISTSIZE"
 export GDBHISTFILE="$HOME/.gdb_history"
 export CVS_RSH="ssh"
-export TZ="Europe/Prague"
-#export TZ="Canada/Eastern"
+export TZ="Asia/Manila"
+#export TZ="Europe/Prague"
+if [ "$TZ" = Asia/Manila ];then
+  alias date='TZ=Asia/Manila date;TZ=Europe/Prague date'
+fi
 export PYTHONUNBUFFERED=1
 export ASAN_OPTIONS=detect_leaks=0
 export GTK_OVERLAY_SCROLLING=0
@@ -394,7 +402,6 @@ function rpmsrclist
 }
 function yumupdate {(ulimit -v unlimited;yum makecache;yum -y --skip-broken update "$@";);}
 function gitcommit { git commit -a --allow-empty-message -m '' "$@"; }
-function git {(unset git;if [ "$1" = "checkout" ];then shift;git checkout --ignore-other-worktrees "$@";else git "$@";fi)}
 function gpg {(unset gpg; http_proxy= all_proxy= HTTP_PROXY= ALL_PROXY= gpg "$@"; );}
 function swap() {( set -ex;local TMPFILE=tmp.$$;[ $# = 2 ] && mv "$1" $TMPFILE && mv "$2" "$1" && mv $TMPFILE "$2" && echo done )}
 alias gthumb='rm -rf ~/.cache/thumbnails/fail/;gthumb'