aboutsummaryrefslogtreecommitdiff
path: root/bash/bashrc.d
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2016-08-17 17:38:45 +1200
committerTom Ryder <tom@sanctum.geek.nz>2016-08-17 17:38:45 +1200
commit67afb66eb1a2e7a1f7c912bdeec002de7b25d91d (patch)
tree0701c5da159452f229eb50a8b1f99387b31a01fe /bash/bashrc.d
parentOnly pull if rebase possible (diff)
downloaddotfiles-67afb66eb1a2e7a1f7c912bdeec002de7b25d91d.tar.gz
dotfiles-67afb66eb1a2e7a1f7c912bdeec002de7b25d91d.zip
Move simple Bash/pdksh functions into POSIX sh
Have only translated the scripts that translate readily into POSIX sh for now. More complex stuff like that bd/pd/sd/ud navigation for Bash doesn't port as easily, mostly because there isn't an analogue for the "local" keyword in POSIX.
Diffstat (limited to 'bash/bashrc.d')
-rw-r--r--bash/bashrc.d/bc.bash7
-rw-r--r--bash/bashrc.d/diff.bash4
-rw-r--r--bash/bashrc.d/ed.bash26
-rw-r--r--bash/bashrc.d/gdb.bash4
-rw-r--r--bash/bashrc.d/gpg.bash10
-rw-r--r--bash/bashrc.d/hgrep.bash16
-rw-r--r--bash/bashrc.d/keychain.bash4
-rw-r--r--bash/bashrc.d/mkcd.bash4
-rw-r--r--bash/bashrc.d/mysql.bash21
-rw-r--r--bash/bashrc.d/pwgen.bash8
-rw-r--r--bash/bashrc.d/rcsdiff.bash4
-rw-r--r--bash/bashrc.d/scp.bash10
-rw-r--r--bash/bashrc.d/scr.bash12
-rw-r--r--bash/bashrc.d/sudo.bash7
-rw-r--r--bash/bashrc.d/tmux.bash19
-rw-r--r--bash/bashrc.d/vim.bash15
16 files changed, 0 insertions, 171 deletions
diff --git a/bash/bashrc.d/bc.bash b/bash/bashrc.d/bc.bash
deleted file mode 100644
index 643678ac..00000000
--- a/bash/bashrc.d/bc.bash
+++ /dev/null
@@ -1,7 +0,0 @@
-# This function is only applicable if bc(1) has the non-POSIX -q option
-command bc -q </dev/null >&0 2>&0 || return
-
-# Don't print the bc(1) welcome message
-bc() {
- command bc -q "$@"
-}
diff --git a/bash/bashrc.d/diff.bash b/bash/bashrc.d/diff.bash
deleted file mode 100644
index 2c752c8d..00000000
--- a/bash/bashrc.d/diff.bash
+++ /dev/null
@@ -1,4 +0,0 @@
-# Use a unified format for diff(1) by default
-diff() {
- command diff -u "$@"
-}
diff --git a/bash/bashrc.d/ed.bash b/bash/bashrc.d/ed.bash
deleted file mode 100644
index b87894df..00000000
--- a/bash/bashrc.d/ed.bash
+++ /dev/null
@@ -1,26 +0,0 @@
-# Add a colon prompt to ed when a command is expected rather than text; makes
-# it feel a lot more like using ex. Only do this when stdin is a terminal,
-# however. Also try and use -v for more verbose error output, and rlwrap(1) if
-# it's available.
-ed() {
-
- # We're only adding options if input is from a terminal
- if [[ -t 0 ]] ; then
-
- # Colon prompt (POSIX)
- set -- -p : "$@"
-
- # Verbose if available (not POSIX)
- if ed -sv - </dev/null >&0 2>&0 ; then
- set -- -v "$@"
- fi
- fi
-
- # Execute the ed(1) call, in a wrapper if appropriate and with the
- # concluded options
- if [[ -t 0 ]] && hash rlwrap 2>/dev/null ; then
- command rlwrap ed "$@"
- else
- command ed "$@"
- fi
-}
diff --git a/bash/bashrc.d/gdb.bash b/bash/bashrc.d/gdb.bash
deleted file mode 100644
index ec9d4137..00000000
--- a/bash/bashrc.d/gdb.bash
+++ /dev/null
@@ -1,4 +0,0 @@
-# Don't print the GDB copyright message on every invocation
-gdb() {
- command gdb -q "$@"
-}
diff --git a/bash/bashrc.d/gpg.bash b/bash/bashrc.d/gpg.bash
deleted file mode 100644
index 62d123ea..00000000
--- a/bash/bashrc.d/gpg.bash
+++ /dev/null
@@ -1,10 +0,0 @@
-# Wrapper around gpg(1) to stop ``--batch'' breaking things
-gpg() {
- # shellcheck disable=SC2048
- case $* in
- *--ed*|*--gen-k*|*--sign-k*)
- set -- --no-batch "$@"
- ;;
- esac
- command gpg "$@"
-}
diff --git a/bash/bashrc.d/hgrep.bash b/bash/bashrc.d/hgrep.bash
deleted file mode 100644
index 2f7f8d54..00000000
--- a/bash/bashrc.d/hgrep.bash
+++ /dev/null
@@ -1,16 +0,0 @@
-# Search shell history file for a pattern. If you put your whole HISTFILE
-# contents into memory, then you probably don't need this, as you can just do:
-#
-# $ history | grep PATTERN
-#
-hgrep() {
- if ! (($#)) ; then
- printf >&2 '%s: Need a pattern\n' "$FUNCNAME"
- exit 2
- fi
- if ! [[ -n $HISTFILE ]] ; then
- printf >&2 '%s: No HISTFILE\n' "$FUNCNAME"
- exit 2
- fi
- grep "$@" "$HISTFILE"
-}
diff --git a/bash/bashrc.d/keychain.bash b/bash/bashrc.d/keychain.bash
deleted file mode 100644
index 40fe5d71..00000000
--- a/bash/bashrc.d/keychain.bash
+++ /dev/null
@@ -1,4 +0,0 @@
-# If GPG_TTY is set, update it
-if [[ -n $GPG_TTY ]] ; then
- GPG_TTY=$(tty)
-fi
diff --git a/bash/bashrc.d/mkcd.bash b/bash/bashrc.d/mkcd.bash
deleted file mode 100644
index 6342d4a6..00000000
--- a/bash/bashrc.d/mkcd.bash
+++ /dev/null
@@ -1,4 +0,0 @@
-# Create a directory and change into it
-mkcd() {
- mkdir -p -- "$1" && builtin cd -- "$1"
-}
diff --git a/bash/bashrc.d/mysql.bash b/bash/bashrc.d/mysql.bash
deleted file mode 100644
index 0d5ddb86..00000000
--- a/bash/bashrc.d/mysql.bash
+++ /dev/null
@@ -1,21 +0,0 @@
-# If a file ~/.mysql/$1.cnf exists, call mysql(1) using that file. Otherwise
-# just run MySQL with given args. Use restrictive permissions on these files.
-# Examples:
-#
-# [client]
-# host=dbhost.example.com
-# user=foo
-# password=SsJ2pICe226jM
-#
-# [mysql]
-# database=bar
-#
-mysql() {
- local config
- config=$HOME/.mysql/$1.cnf
- if [[ -r $config ]] ; then
- shift
- set -- --defaults-extra-file="$config" "$@"
- fi
- command mysql "$@"
-}
diff --git a/bash/bashrc.d/pwgen.bash b/bash/bashrc.d/pwgen.bash
deleted file mode 100644
index 7ba056e5..00000000
--- a/bash/bashrc.d/pwgen.bash
+++ /dev/null
@@ -1,8 +0,0 @@
-# Set some defaults for pwgen(1), because its defaults are to give me a long
-# list of relatively short passwords, when I generally want only one good one
-pwgen() {
- if ! (($#)) ; then
- set -- --secure -- "${PWGEN_LENGTH:-15}" "${PWGEN_COUNT:-1}"
- fi
- command pwgen "$@"
-}
diff --git a/bash/bashrc.d/rcsdiff.bash b/bash/bashrc.d/rcsdiff.bash
deleted file mode 100644
index 18b1d324..00000000
--- a/bash/bashrc.d/rcsdiff.bash
+++ /dev/null
@@ -1,4 +0,0 @@
-# Use a unified format for rcsdiff(1) by default
-rcsdiff() {
- command rcsdiff -u "$@"
-}
diff --git a/bash/bashrc.d/scp.bash b/bash/bashrc.d/scp.bash
deleted file mode 100644
index cd2f8521..00000000
--- a/bash/bashrc.d/scp.bash
+++ /dev/null
@@ -1,10 +0,0 @@
-# Wrap scp(1) to check for missing colons
-scp() {
- # shellcheck disable=SC2048
- if (($# >= 2)) && [[ $* != *:* ]] ; then
- printf 'bash: %s: Missing colon, probably an error\n' \
- "$FUNCNAME" >&2
- return 2
- fi
- command scp "$@"
-}
diff --git a/bash/bashrc.d/scr.bash b/bash/bashrc.d/scr.bash
deleted file mode 100644
index bf2990fd..00000000
--- a/bash/bashrc.d/scr.bash
+++ /dev/null
@@ -1,12 +0,0 @@
-# Create a temporary directory and change into it, to stop me putting stray
-# files into $HOME, and making the system do cleanup for me. Single optional
-# argument is the string to use for naming the directory; defaults to "scr".
-scr() {
- if (($# <= 1)) ; then
- pushd -- "$(mktd "${1:-"$FUNCNAME"}")"
- else
- printf 'bash: %s: too many arguments\n' \
- "$FUNCNAME" >&2
- return 2
- fi
-}
diff --git a/bash/bashrc.d/sudo.bash b/bash/bashrc.d/sudo.bash
deleted file mode 100644
index d6d91d12..00000000
--- a/bash/bashrc.d/sudo.bash
+++ /dev/null
@@ -1,7 +0,0 @@
-# Add the -H parameter to sudo(8) calls, always use the target user's $HOME
-sudo() {
- if [[ $1 != -v ]] ; then
- set -- -H "$@"
- fi
- command sudo "$@"
-}
diff --git a/bash/bashrc.d/tmux.bash b/bash/bashrc.d/tmux.bash
deleted file mode 100644
index f0d0e36a..00000000
--- a/bash/bashrc.d/tmux.bash
+++ /dev/null
@@ -1,19 +0,0 @@
-# Attach to existing tmux session rather than create a new one if possible
-tmux() {
-
- # If given any arguments, just use them as they are
- if (($#)) ; then
- :
-
- # If a session exists, just attach to it
- elif command tmux has-session 2>/dev/null ; then
- set -- attach-session -d
-
- # Create a new session with an appropriate name
- else
- set -- new-session -s "${TMUX_SESSION:-default}"
- fi
-
- # Execute with concluded arguments
- command tmux "$@"
-}
diff --git a/bash/bashrc.d/vim.bash b/bash/bashrc.d/vim.bash
deleted file mode 100644
index 37fc1871..00000000
--- a/bash/bashrc.d/vim.bash
+++ /dev/null
@@ -1,15 +0,0 @@
-# If Vim exists on the system, use it instead of ex, vi, and view
-if ! hash vim 2>/dev/null ; then
- return
-fi
-
-# Define functions proper
-ex() {
- vim -e "$@"
-}
-vi() {
- vim "$@"
-}
-view() {
- vim -R "$@"
-}