projects
/
clearscm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
More changes to standardize Songbook
[clearscm.git]
/
rc
/
functions
diff --git
a/rc/functions
b/rc/functions
index
c27274b
..
059d7cc
100644
(file)
--- a/
rc/functions
+++ b/
rc/functions
@@
-17,23
+17,13
@@
CR=$(echo "\015")
view_name=
view_name=
-function in_git_repo {
- pwd=$PWD
-
- while [ "$pwd" != "/" ]; do
- if [ -d "$pwd/.git" ]; then
- true;
- return;
- fi
-
- pwd=$(dirname $pwd)
- done
-
- false
-} # in_git_repo
-
# Function to set the title bar. Works on the terminal emulators listed.
function title_bar {
# Function to set the title bar. Works on the terminal emulators listed.
function title_bar {
+ if [ $# -gt 1 ]; then
+ ROOT=shift
+ ROOT="${NORMAL}\($ROOT\)"
+ fi
+
prefix="$@"
# Change $HOME -> ~
if [ "${PWD#$HOME*}" != "$PWD" ]; then
prefix="$@"
# Change $HOME -> ~
if [ "${PWD#$HOME*}" != "$PWD" ]; then
@@
-55,7
+45,7
@@
function title_bar {
# Add GIT info if available
if in_git_repo; then
# Add GIT info if available
if in_git_repo; then
- current_dir="
git: $(git branch | sed -n -e 's/^\* \(.*\)/\1/p') $current_dir
"
+ current_dir="
$current_dir [git: $(git branch | sed -n -e 's/^\* \(.*\)/\1/p')]
"
fi
if [ "$TERM" = "hpterm" -o \
fi
if [ "$TERM" = "hpterm" -o \
@@
-67,8
+57,11
@@
function title_bar {
"$TERM" = "vt221" ]; then
string=$(echo "${SYSNAME##*:}:$@")
echo -n "${ESC}]2;$string\007"
"$TERM" = "vt221" ]; then
string=$(echo "${SYSNAME##*:}:$@")
echo -n "${ESC}]2;$string\007"
- elif [ "$TERM" = "cygwin" -o "$TERM" = "vt100" -o "$TERM" = "xterm" ]; then
- PS1="\[\e]0;$prefix$current_dir\a\e[01;33m\]$SYSNAME:\[\e[0m\]"
+ elif [ "$TERM" = "cygwin" -o \
+ "$TERM" = "vt100" -o \
+ "$TERM" = "xterm" -o \
+ "$TERM" = "xterm-256color" ]; then
+ PS1="\[\e]0;$prefix$current_dir\a\[$RED\]$ROOT\[$LIGHT_CYAN\]$SYSNAME:\[$WHITE\]"
fi
} # title_bar
fi
} # title_bar
@@
-126,17
+119,19
@@
function set_prompt {
"$TERM" = "dtterm" -o \
! -z "$DTTERM" ]; then
ROOT="${RED}Wizard$NORMAL "
"$TERM" = "dtterm" -o \
! -z "$DTTERM" ]; then
ROOT="${RED}Wizard$NORMAL "
- elif [ "$TERM" = "vt100" -o \
- "$TERM" = "xterm" -o \
- "$TERM" = "vt220" ]; then
+ elif [ "$TERM" = "vt100" -o \
+ "$TERM" = "xterm" -o \
+ "$TERM" = "xterm-256color" -o \
+ "$TERM" = "vt220" ]; then
ROOT="${BOLD}${BLINK}Wizard$NORMAL "
fi
else
ROOT=""
fi
ROOT="${BOLD}${BLINK}Wizard$NORMAL "
fi
else
ROOT=""
fi
- if [ "$TERM" = "vt100" -o \
- "$TERM" = "xterm" -o \
+ if [ "$TERM" = "vt100" -o \
+ "$TERM" = "xterm" -o \
+ "$TERM" = "xterm-256color" -o \
"$TERM" = "vt220" ]; then
PS1="$ROOT$BOLD$SYSNAME:$NORMAL"
else
"$TERM" = "vt220" ]; then
PS1="$ROOT$BOLD$SYSNAME:$NORMAL"
else
@@
-203,6
+198,18
@@
function ssh {
set_prompt
} # ssh
set_prompt
} # ssh
+function processRunning {
+ if [ $ARCHITECTURE = "FreeBSD" ]; then
+ psopts="-aux"
+ else
+ psopts="-ef"
+ fi
+
+ if [ $1 != '' ]; then
+ return $(ps $psopts | grep "$1" | grep -v "grep $1" | grep -v "grep -d skip" | wc -l)
+ fi
+} # processRunning
+
function sj {
if [ $ARCHITECTURE = "FreeBSD" ]; then
psopts="-aux"
function sj {
if [ $ARCHITECTURE = "FreeBSD" ]; then
psopts="-aux"
@@
-256,17
+263,47
@@
function cmdline {
} # cmdline
function user {
} # cmdline
function user {
+ processRunning ypbind; ypbind=$?
+ processRunning winbind; winbind=$?
+
if [ $# -gt 0 ]; then
if [ $# -gt 0 ]; then
- ypcat passwd | grep -i $@
+ if [ $ypbind -gt 0 ]; then
+ ypcat passwd | grep -i $@
+ elif [ $winbind -gt 0 ]; then
+ for user in $(wbinfo -u | grep -i $@); do
+ wbinfo --user-info $user
+ done
+ fi
else
else
- ypcat passwd | $PAGER
+ if [ $ypbind -gt 0 ]; then
+ ypcat passwd | $PAGER
+ elif [ $wbind -gt 0 ]; then
+ for user in $(wbinfo -u); do
+ wbinfo --user-info $user
+ done | $PAGER
+ fi
fi
} # user
function group {
fi
} # user
function group {
+ processRunning ypbind; ypbind=$?
+ processRunning winbind; winbind=$?
+
if [ $# -gt 0 ]; then
if [ $# -gt 0 ]; then
- ypcat group | grep -i $@
+ if [ $ypbind -gt 0 ]; then
+ ypcat group | grep -i $@
+ elif [ $winbind -gt 0 ]; then
+ for group in $(wbinfo -g | grep -i $@); do
+ wbinfo --group-info $group
+ done
+ fi
else
else
- ypcat group | $PAGER
+ if [ $ypbind -gt 0 ]; then
+ ypcat group | $PAGER
+ elif [ $winbind -gt 0 ]; then
+ for group in $(wbinfo -g); do
+ wbinfo --group-info $group
+ done | $PAGER
+ fi
fi
} # group
fi
} # group