From 71ee07fd12df173a7bc7fd1a7479cd09986f7956 Mon Sep 17 00:00:00 2001
From: Tom Ryder <tom@sanctum.geek.nz>
Date: Thu, 12 Mar 2015 10:05:39 +1300
Subject: Simplify a few default value settings

---
 bash/bashrc.d/pushd.bash  | 6 +-----
 bash/bashrc.d/pwgen.bash  | 2 +-
 bash/bashrc.d/remind.bash | 6 +-----
 3 files changed, 3 insertions(+), 11 deletions(-)

(limited to 'bash/bashrc.d')

diff --git a/bash/bashrc.d/pushd.bash b/bash/bashrc.d/pushd.bash
index 6da42fee..c3e01a5e 100644
--- a/bash/bashrc.d/pushd.bash
+++ b/bash/bashrc.d/pushd.bash
@@ -1,9 +1,5 @@
 # Make pushd default to $HOME if no arguments given, much like cd
 pushd() {
-    if (($#)) ; then
-        builtin pushd "$@"
-    else
-        builtin pushd -- "$HOME"
-    fi
+    builtin pushd "${@:-$HOME}"
 }
 
diff --git a/bash/bashrc.d/pwgen.bash b/bash/bashrc.d/pwgen.bash
index 10cd3a41..1ac80505 100644
--- a/bash/bashrc.d/pwgen.bash
+++ b/bash/bashrc.d/pwgen.bash
@@ -4,7 +4,7 @@ pwgen() {
     if (($#)) ; then
         command pwgen "$@"
     else
-        command pwgen -s -- "${PWGEN_LENGTH:-15}" "${PWGEN_COUNT:-1}"
+        command pwgen --secure -- "${PWGEN_LENGTH:-15}" "${PWGEN_COUNT:-1}"
     fi
 }
 
diff --git a/bash/bashrc.d/remind.bash b/bash/bashrc.d/remind.bash
index 88d094af..eaa724e0 100644
--- a/bash/bashrc.d/remind.bash
+++ b/bash/bashrc.d/remind.bash
@@ -1,9 +1,5 @@
 # Default filename for remind(1) is ~/.reminders
 remind() {
-    if ! (($#)) && [[ -r "$HOME"/.reminders ]] ; then
-        command remind "$HOME"/.reminders
-    else
-        command remind "$@"
-    fi
+    command remind "${@:-"$HOME"/.reminders}"
 }
 
-- 
cgit v1.2.3