Skip to content
Browse files

- fixed a bug here and there

- made it fully sh compliant (works even with solaris sh)
  • Loading branch information...
1 parent 456dcf2 commit b3c9a9c6e9bd1baf28dcb76cb347cf8f589bbd12 @majnemer committed
Showing with 70 additions and 51 deletions.
  1. +9 −7 commonsh/01_ports
  2. +22 −10 commonsh/02_term
  3. +12 −10 commonsh/10_alias
  4. +8 −6 commonsh/10_git
  5. +6 −5 commonsh/10_pager
  6. +2 −1 commonsh/10_rlwrap
  7. +10 −11 commonsh/10_utility
  8. +1 −1 lessfilter
View
16 commonsh/01_ports
@@ -1,25 +1,27 @@
-if [[ -d /opt/local/man ]] ; then
- if [[ -z "${MANPATH}" ]] ; then
- MANPATH="/opt/local/man":$(manpath)
+#! /bin/sh
+
+if [ -d /opt/local/man ] ; then
+ if [ -z "${MANPATH}" ] ; then
+ MANPATH="/opt/local/man":`manpath`
else
MANPATH="/opt/local/man:${MANPATH}"
fi
export MANPATH
fi
-if [[ -d /opt/local/bin ]] ; then
- if [[ -z "${PATH}" ]] ; then
+if [ -d /opt/local/bin ] ; then
+ if [ -z "${PATH}" ] ; then
PATH="/opt/local/bin"
else
PATH="/opt/local/bin:${PATH}"
fi
fi
-if [[ -d /opt/local/sbin ]] ; then
+if [ -d /opt/local/sbin ] ; then
PATH="/opt/local/sbin:${PATH}"
fi
-if [[ -d /opt/local/libexec ]] ; then
+if [ -d /opt/local/libexec ] ; then
PATH="/opt/local/libexec:${PATH}"
fi
View
32 commonsh/02_term
@@ -1,7 +1,9 @@
+#! /bin/sh
+
# terminal fallback stuff
-function fix_term ()
+fix_term ()
{
- if (infocmp $1 &> /dev/null) ; then
+ if (infocmp $1 > /dev/null 2>&1) ; then
echo $1
else
case $1 in
@@ -28,12 +30,14 @@ function fix_term ()
}
# sorta hacky, but I cannot find a better way to do this :/
-function fix_terminfo_db ()
+fix_terminfo_db ()
{
- if [[ `type -p infocmp` = "$1/bin/infocmp" ]] ; then
- export TERMINFO="$1/share/terminfo"
+ if [ `command -v infocmp` = "$1/bin/infocmp" ] ; then
+ TERMINFO="$1/share/terminfo"
+ export TERMINFO
fi
}
+
# terminal surgery
case `uname -s` in
Interix)
@@ -42,11 +46,19 @@ case `uname -s` in
SunOS)
fix_terminfo_db "/opt/csw"
;;
+ Darwin)
+ fix_terminfo_db "/opt/local"
+ ;;
esac
-export TERM=$(fix_term $TERM)
-
-if [[ $TERM == *256* ]] && (infocmp screen-256color-bce &> /dev/null) ; then
- export SCREEN_COLOR="-256color"
-fi
+TERM=`fix_term $TERM`
+export TERM
+case $TERM in
+ *256*)
+ if (infocmp screen-256color-bce > /dev/null 2>&1) ; then
+ SCREEN_COLOR="-256color"
+ export SCREEN_COLOR
+ fi
+ ;;
+esac
View
22 commonsh/10_alias
@@ -1,15 +1,16 @@
+#! /bin/sh
# colors
for dircolors in gdircolors dircolors ; do
- if (type -p $dircolors &> /dev/null) ; then
- [ -f /etc/DIR_COLORS ] && eval $($dircolors -b /etc/DIR_COLORS) && break
- [ -f "${HOME}/.dir_colors" ] && eval $($dircolors -b "${HOME}/.dir_colors") && break
- eval $($dircolors -b) && break
+ if (command -v $dircolors > /dev/null 2>&1) ; then
+ [ -f /etc/DIR_COLORS ] && eval `$dircolors -b /etc/DIR_COLORS` && break
+ [ -f "${HOME}/.dir_colors" ] && eval `$dircolors -b "${HOME}/.dir_colors"` && break
+ eval `$dircolors -b` && break
fi
done
# gimmie an editor, make it a nice vi clone
for EDITOR in vim elvis vile nvi vi ; do
- (type -p $EDITOR &> /dev/null) && break
+ (command -v $EDITOR > /dev/null 2>&1) && break
done
export EDITOR
@@ -23,7 +24,8 @@ case `uname -s` in
alias grep='grep -d skip --color=auto'
;;
FreeBSD|Darwin|DragonFly)
- export LSCOLORS=ExGxFxDxCxDxDxHbaDacec
+ LSCOLORS=ExGxFxDxCxDxDxHbaDacec
+ export LSCOLORS
alias ls="ls -Gh"
alias grep='grep -d skip --color=auto'
;;
@@ -31,18 +33,18 @@ case `uname -s` in
alias ls="ls --color"
;;
SunOS)
- if (type -p gls &> /dev/null) ; then
+ if (command -v gls > /dev/null 2>&1) ; then
alias ls="gls -h --color=auto"
else
alias ls="ls -h"
fi
- if (type -p ggrep &> /dev/null) ; then
+ if (command -v ggrep > /dev/null 2>&1) ; then
alias grep='ggrep -d skip --color=auto'
fi
for locate in glocate slocate ; do
- (type -p $locate &> /dev/null) && alias locate=$locate
+ (command -v $locate > /dev/null 2>&1) && alias locate=$locate
done
;;
esac
@@ -52,4 +54,4 @@ alias du='du -h'
alias ping='ping -c4'
-(type -p time &> /dev/null) && alias time='command time'
+(command -v time > /dev/null 2>&1) && alias time='command time'
View
14 commonsh/10_git
@@ -1,21 +1,23 @@
-if [[ -d /usr/local/git/man ]] ; then
- if [[ -z "${MANPATH}" ]] ; then
- MANPATH="/usr/local/git/man":$(manpath)
+#! /bin/sh
+
+if [ -d /usr/local/git/man ] ; then
+ if [ -z "${MANPATH}" ] ; then
+ MANPATH="/usr/local/git/man":`manpath`
else
MANPATH="/usr/local/git/man:${MANPATH}"
fi
export MANPATH
fi
-if [[ -d /usr/local/git/bin ]] ; then
- if [[ -z "${PATH}" ]] ; then
+if [ -d /usr/local/git/bin ] ; then
+ if [ -z "${PATH}" ] ; then
PATH="/usr/local/git/bin"
else
PATH="/usr/local/git/bin:${PATH}"
fi
fi
-if [[ -d /usr/local/git/libexec/git-core ]] ; then
+if [ -d /usr/local/git/libexec/git-core ] ; then
PATH="/usr/local/git/libexec/git-core:${PATH}"
fi
View
11 commonsh/10_pager
@@ -1,17 +1,18 @@
for PAGER in less more pg ; do
- (type -p $PAGER &> /dev/null) && break
+ (command -v $PAGER > /dev/null 2>&1) && break
done
export PAGER
# if we are in less, we can set some options and use lesspipe
-if [[ $PAGER = "less" ]] ; then
+if [ $PAGER = less ] ; then
# lesspipe can go by either lesspipe or lesspipe.sh
for lesspipe in lesspipe lesspipe.sh ; do
- if (type -p $lesspipe &> /dev/null) ; then
- eval $(SHELL=/bin/sh $lesspipe) && break
+ if (command -v $lesspipe > /dev/null 2>&1) ; then
+ eval `SHELL=/bin/sh $lesspipe` && break
fi
done
# let less be case insensitive
- export LESS='-i -R -M'
+ LESS='-R -M'
+ export LESS
fi
View
3 commonsh/10_rlwrap
@@ -1,3 +1,4 @@
+#! /bin/sh
for wrap in rlwrap rlfe cle ; do
- (type -p $wrap &> /dev/null) && alias ocaml="$wrap ocaml" && break
+ (command -v $wrap > /dev/null 2>&1) && alias ocaml="$wrap ocaml" && break
done
View
21 commonsh/10_utility
@@ -1,15 +1,16 @@
+#! /bin/sh
# utility.sh
# Miscellaneous Utility Functions
-function unkey-host ()
+unkey_host ()
{
[ ${#} -ne 1 ] && return 1
sed -i -e "/$1/d" $HOME/.ssh/known_hosts
}
-function mkcd ()
+mkcd ()
{
- if [[ -d "$1" ]] ; then
+ if [ -d "$1" ] ; then
cd "$1"
return
fi
@@ -17,16 +18,14 @@ function mkcd ()
mkdir -p "$1" && cd "$1"
}
-function extract ()
+extract ()
{
- if [[ ! -f "$1" ]] ; then
+ if [ ! -f "$1" ] ; then
echo "The file ("$1") does not exist!"
return
fi
- local filename
-
- filename=$(echo "$1" | tr '[:upper:]' '[:lower:]')
+ filename=`echo "$1" | tr '[:upper:]' '[:lower:]'`
case "$filename" in
*.tar)
@@ -42,10 +41,10 @@ function extract ()
unzip -qo "${1}"
;;
*.gz|*.z)
- gzip -dc "${1}" > $(basename "${1%.*}")
+ gzip -dc "${1}" > `basename "${1%.*}"`
;;
*.bz2)
- bzip2 -dc "${1}" > $(basename "${1%.*}")
+ bzip2 -dc "${1}" > `basename "${1%.*}"`
;;
*.rar)
unrar x -idq "${1}"
@@ -60,7 +59,7 @@ function extract ()
lzma -dc "${1}" | tar xf
;;
*.lzma)
- lzma -dc "${1}" > $(basename "${1%.*}")
+ lzma -dc "${1}" > `basename "${1%.*}"`
;;
*)
echo "Unable to extract '"$1"'"
View
2 lessfilter
@@ -1,4 +1,4 @@
-#!/bin/sh
+#! /bin/sh
# Decode file for less
case `echo "$1" | tr '[:upper:]' '[:lower:]'` in
# we don't handle archives, we let the big guy do it

0 comments on commit b3c9a9c

Please sign in to comment.
Something went wrong with that request. Please try again.