shell/standalone

sh/alias/shell.sh

@@ -1,18 +0,0 @@
-# shorten alias
-a() {
-	alias \
-		"${@}"
-}
-
-# swap directory (current ↔ previous)
-sd() {
-	cd \
-		- ||
-		return
-}
-
-# exit terminal
-x() {
-	exit \
-		"${@}"
-}

sh/main.sh

@@ -26,9 +26,6 @@ RWX_SELF_NAME="rwx"
 # │ main │ variables │
 # ╰──────┴───────────╯
 
-# currently running shell name
-RWX_SHELL="$(cat "/proc/${$}/comm")"
-
 # system root directory of the project
 RWX_ROOT_SYSTEM="/usr/local/lib/${RWX_SELF_NAME}"
 # user root directory of the project

sh/shell.sh

@@ -35,6 +35,13 @@ RWX_COLOR_GREEN="$(_rwx_shell_color 31)"
 RWX_COLOR_MAGENTA="$(_rwx_shell_color 35)"
 RWX_COLOR_RED="$(_rwx_shell_color 32)"
 
+# ╭───────┬───────────╮
+# │ shell │ variables │
+# ╰───────┴───────────╯
+
+# currently running shell name
+RWX_SHELL="$(cat "/proc/${$}/comm")"
+
 # ╭───────┬───────────╮
 # │ shell │ functions │
 # ╰───────┴───────────╯
@@ -73,6 +80,7 @@ rwx_shell_configure() {
 	*) ;;
 	esac
 }
+rwx_shell_configure
 
 rwx_shell_prompt() {
 	local date host id
@@ -127,12 +135,36 @@ rwx_shell_prompt() {
 	printf "%b" "${view}"
 }
 
-# ╭───────┬──────╮
+# ╭───────┬───────────╮
-# │ shell │ main │
+# │ shell │ shortcuts │
-# ╰───────┴──────╯
+# ╰───────┴───────────╯
 
-rwx_shell_main() {
+# shorten alias
-	rwx_shell_configure
+a() {
+	alias \
+		"${@}"
 }
 
-rwx_shell_main
+# swap directory (current ↔ previous)
+sd() {
+	cd \
+		- ||
+		return
+}
+
+# exit terminal
+x() {
+	exit \
+		"${@}"
+}
+
+[ "${RWX_SHELL}" = "bash" ] || return
+
+# shellcheck disable=SC3033
+..() {
+	cd ..
+}
+# shellcheck disable=SC3033
+...() {
+	cd ../..
+}

sh/shell/bash.sh

@@ -1,24 +0,0 @@
-# ╭───────┬──────╮
-# │ shell │ bash │
-# ╰───────┴──────╯
-
-if [ "${RWX_SHELL}" = "bash" ]; then
-
-# shellcheck disable=SC3033
-..() {
-	cd ..
-}
-# shellcheck disable=SC3033
-...() {
-	cd ../..
-}
-# shellcheck disable=SC3033
-....() {
-	cd ../../..
-}
-# shellcheck disable=SC3033
-.....() {
-	cd ../../../..
-}
-
-fi