From 0af292e43cfaa04e38c79ed290cdb13b4dc097bb Mon Sep 17 00:00:00 2001
From: crupest <crupest@outlook.com>
Date: Sun, 16 Jun 2024 11:38:17 +0800
Subject: feat(docker/debian-dev): distinguish bash profile and bashrc.

---
 .../crupest-debian-dev/bootstrap/bash-profile/bash-completion.bash  | 4 ----
 docker/crupest-debian-dev/bootstrap/bash-profile/code-server.bash   | 2 --
 docker/crupest-debian-dev/bootstrap/bash-profile/dquilt.bash        | 4 ----
 docker/crupest-debian-dev/bootstrap/bash/bash-completion.bash       | 4 ++++
 docker/crupest-debian-dev/bootstrap/bash/code-server.bash           | 2 ++
 docker/crupest-debian-dev/bootstrap/bash/dquilt.bash                | 4 ++++
 docker/crupest-debian-dev/bootstrap/func.bash                       | 6 +++++-
 docker/crupest-debian-dev/bootstrap/setup-base.bash                 | 2 +-
 docker/crupest-debian-dev/bootstrap/setup-dev.bash                  | 2 +-
 9 files changed, 17 insertions(+), 13 deletions(-)
 delete mode 100644 docker/crupest-debian-dev/bootstrap/bash-profile/bash-completion.bash
 delete mode 100644 docker/crupest-debian-dev/bootstrap/bash-profile/code-server.bash
 delete mode 100644 docker/crupest-debian-dev/bootstrap/bash-profile/dquilt.bash
 create mode 100644 docker/crupest-debian-dev/bootstrap/bash/bash-completion.bash
 create mode 100644 docker/crupest-debian-dev/bootstrap/bash/code-server.bash
 create mode 100644 docker/crupest-debian-dev/bootstrap/bash/dquilt.bash

(limited to 'docker/crupest-debian-dev/bootstrap')

diff --git a/docker/crupest-debian-dev/bootstrap/bash-profile/bash-completion.bash b/docker/crupest-debian-dev/bootstrap/bash-profile/bash-completion.bash
deleted file mode 100644
index 75f8333..0000000
--- a/docker/crupest-debian-dev/bootstrap/bash-profile/bash-completion.bash
+++ /dev/null
@@ -1,4 +0,0 @@
-if [ -f /etc/bash_completion ]; then
- . /etc/bash_completion
-fi
-
diff --git a/docker/crupest-debian-dev/bootstrap/bash-profile/code-server.bash b/docker/crupest-debian-dev/bootstrap/bash-profile/code-server.bash
deleted file mode 100644
index 255c280..0000000
--- a/docker/crupest-debian-dev/bootstrap/bash-profile/code-server.bash
+++ /dev/null
@@ -1,2 +0,0 @@
-mkdir -p ~/.local/share/code-server
-/bootstrap/start/code-server.bash > ~/.local/share/code-server/log  2> ~/.local/share/code-server/error &
diff --git a/docker/crupest-debian-dev/bootstrap/bash-profile/dquilt.bash b/docker/crupest-debian-dev/bootstrap/bash-profile/dquilt.bash
deleted file mode 100644
index 96a4eb2..0000000
--- a/docker/crupest-debian-dev/bootstrap/bash-profile/dquilt.bash
+++ /dev/null
@@ -1,4 +0,0 @@
-alias dquilt="quilt --quiltrc=${HOME}/.quiltrc-dpkg"
-. /usr/share/bash-completion/completions/quilt
-complete -F _quilt_completion $_quilt_complete_opt dquilt
-
diff --git a/docker/crupest-debian-dev/bootstrap/bash/bash-completion.bash b/docker/crupest-debian-dev/bootstrap/bash/bash-completion.bash
new file mode 100644
index 0000000..75f8333
--- /dev/null
+++ b/docker/crupest-debian-dev/bootstrap/bash/bash-completion.bash
@@ -0,0 +1,4 @@
+if [ -f /etc/bash_completion ]; then
+ . /etc/bash_completion
+fi
+
diff --git a/docker/crupest-debian-dev/bootstrap/bash/code-server.bash b/docker/crupest-debian-dev/bootstrap/bash/code-server.bash
new file mode 100644
index 0000000..255c280
--- /dev/null
+++ b/docker/crupest-debian-dev/bootstrap/bash/code-server.bash
@@ -0,0 +1,2 @@
+mkdir -p ~/.local/share/code-server
+/bootstrap/start/code-server.bash > ~/.local/share/code-server/log  2> ~/.local/share/code-server/error &
diff --git a/docker/crupest-debian-dev/bootstrap/bash/dquilt.bash b/docker/crupest-debian-dev/bootstrap/bash/dquilt.bash
new file mode 100644
index 0000000..96a4eb2
--- /dev/null
+++ b/docker/crupest-debian-dev/bootstrap/bash/dquilt.bash
@@ -0,0 +1,4 @@
+alias dquilt="quilt --quiltrc=${HOME}/.quiltrc-dpkg"
+. /usr/share/bash-completion/completions/quilt
+complete -F _quilt_completion $_quilt_complete_opt dquilt
+
diff --git a/docker/crupest-debian-dev/bootstrap/func.bash b/docker/crupest-debian-dev/bootstrap/func.bash
index d17fa1b..7782035 100644
--- a/docker/crupest-debian-dev/bootstrap/func.bash
+++ b/docker/crupest-debian-dev/bootstrap/func.bash
@@ -7,7 +7,11 @@ is_true() {
 }
 
 append-bash-profile() {
-    cat "/bootstrap/bash-profile/$1" >> /home/$CRUPEST_DEBIAN_DEV_USER/.bash_profile
+    cat "/bootstrap/bash/$1" >> /home/$CRUPEST_DEBIAN_DEV_USER/.bash_profile
+}
+
+append-bashrc() {
+    cat "/bootstrap/bash/$1" >> /home/$CRUPEST_DEBIAN_DEV_USER/.bashrc
 }
 
 copy-home-dot-file() {
diff --git a/docker/crupest-debian-dev/bootstrap/setup-base.bash b/docker/crupest-debian-dev/bootstrap/setup-base.bash
index ce3372f..5a68b9f 100755
--- a/docker/crupest-debian-dev/bootstrap/setup-base.bash
+++ b/docker/crupest-debian-dev/bootstrap/setup-base.bash
@@ -20,6 +20,6 @@ mkdir -p /data /state
 chown $CRUPEST_DEBIAN_DEV_USER:$CRUPEST_DEBIAN_DEV_USER /data /state
 echo "Creating data dir done."
 
-append-bash-profile bash-completion.bash
+append-bashrc bash-completion.bash
 
 echo "Setting up basic system function done."
diff --git a/docker/crupest-debian-dev/bootstrap/setup-dev.bash b/docker/crupest-debian-dev/bootstrap/setup-dev.bash
index 1335afc..92deacb 100755
--- a/docker/crupest-debian-dev/bootstrap/setup-dev.bash
+++ b/docker/crupest-debian-dev/bootstrap/setup-dev.bash
@@ -11,7 +11,7 @@ apt-get install -y build-essential git devscripts debhelper quilt
 apt-get build-dep -y linux
 echo "Installing dev packages done."
 
-append-bash-profile dquilt.bash
+append-bashrc dquilt.bash
 copy-home-dot-file devscripts
 copy-home-dot-file quiltrc-dpkg
 
-- 
cgit v1.2.3