summaryrefslogtreecommitdiffstats
authorRaghavendra D Prabhu <[email protected]>2011-04-16 11:46:04 (GMT)
committer Raghavendra D Prabhu <[email protected]>2011-04-16 11:46:04 (GMT)
commit755817023ac91292965979cfe64173dabf92c348 (patch) (side-by-side diff)
tree5697346d6372c9b51ad9eadcf9bf2e7a93af2cb7
parent353a7f4a0f0a987781e7f84fc1c81b814176a4be (diff)
downloadScripts-755817023ac91292965979cfe64173dabf92c348.zip
Scripts-755817023ac91292965979cfe64173dabf92c348.tar.gz
Scripts-755817023ac91292965979cfe64173dabf92c348.tar.bz2
Updates ftw
Diffstat (more/less context) (show whitespace changes)
-rwxr-xr-xgitprompt6
-rwxr-xr-xmplayer5
2 files changed, 5 insertions, 6 deletions
diff --git a/gitprompt b/gitprompt
index f96c8d4..4636744 100755
--- a/gitprompt
+++ b/gitprompt
@@ -7,9 +7,9 @@ autoload -U colors && colors
estatus=0
#isgit="$(git rev-parse --is-inside-work-tree 2>/dev/null)"
-isgit="$(git rev-parse --is-inside-work-tree 2>/dev/null)"
-#if test (../)#.git(N) 2>/dev/null;then
-if [[ $isgit == "true" ]];then
+#isgit="$(git rev-parse --is-inside-work-tree 2>/dev/null)"
+if test (../)#.git 2>/dev/null;then
+#if [[ $isgit == "true" ]];then
local gprompt="("
gprompt+="$(git branch | grep '*'| cut -d ' ' -f 2 | tr -d '\n')"
#timeout 3 git status -s
diff --git a/mplayer b/mplayer
index 6f3891d..82cad0e 100755
--- a/mplayer
+++ b/mplayer
@@ -173,18 +173,17 @@ pushd $HOME
${=LOCK}/mplayer.$randnum /usr/bin/mplayer -$vo_map[$fixedvo] -msglevel all=4 -slave -idle -input file=$MPSOCKET -input conf=$HOME/.mplayer/input.conf.mine &!
popd
-
FILE=$retval
preplay
-[[ $firstime == 1 ]] && sleep 3
+[[ $firstime == 1 ]] && sleep 2
if [[ $stdin == 1 ]];then
fd=$(readlink -f /dev/stdin)
exec 3<&0
exec 0</dev/tty
- ${=LOCK}/mplayer.$randnum /usr/bin/mplayer -$vo_map[$fixedvo] -msglevel all=4 -slave -idle -input file=$MPSOCKET -input conf=$HOME/.mplayer/input.conf.mine &!
+ #${=LOCK}/mplayer.$randnum /usr/bin/mplayer -$vo_map[$fixedvo] -msglevel all=4 -slave -idle -input file=$MPSOCKET -input conf=$HOME/.mplayer/input.conf.mine &!
pecho "loadfile $fd " /tmp/mplayer.fif
#/usr/bin/mplayer -
exit 110