From 84aac3fca72d73b65d994318e85c2596657f310e Mon Sep 17 00:00:00 2001 From: Daniel Braun <7925710+braun-daniel@users.noreply.github.com> Date: Thu, 10 Oct 2024 22:08:56 +0000 Subject: [PATCH 1/3] Fixes; --- src/fzf/install.sh | 3 ++- src/spaceship/install.sh | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/fzf/install.sh b/src/fzf/install.sh index fd52eb9..749118a 100644 --- a/src/fzf/install.sh +++ b/src/fzf/install.sh @@ -7,9 +7,10 @@ echo "Installing git and wget..." apt-get update apt-get install -y git wget -# Install fzf as the remote user +# Prepare variables _REMOTE_USER=${_REMOTE_USER:-"root"} _REMOTE_USER_HOME=$(eval echo "~${_REMOTE_USER}") +# Install fzf su - "$_REMOTE_USER" -c "git clone --depth 1 https://github.com/junegunn/fzf.git ${_REMOTE_USER_HOME}/.fzf" su - "$_REMOTE_USER" -c "${_REMOTE_USER_HOME}/.fzf/install --all" \ No newline at end of file diff --git a/src/spaceship/install.sh b/src/spaceship/install.sh index 012db7f..eeb340a 100644 --- a/src/spaceship/install.sh +++ b/src/spaceship/install.sh @@ -9,9 +9,9 @@ echo "Installing dependencies..." apt-get update apt-get install -y zsh git -# Use ZSH as default shell -echo "Permanently changing shell to ZSH..." -chsh -s "$(which zsh)" +# Prepare variables +_REMOTE_USER=${_REMOTE_USER:-"root"} +_REMOTE_USER_HOME=$(eval echo "~${_REMOTE_USER}") # Install spaceship-prompt su - "$_REMOTE_USER" -c "mkdir -p ${_REMOTE_USER_HOME}/.zsh" From 34d76be294e654308bb4592eb58da5c4eb6c02b0 Mon Sep 17 00:00:00 2001 From: Daniel Braun <7925710+braun-daniel@users.noreply.github.com> Date: Fri, 11 Oct 2024 06:34:59 +0000 Subject: [PATCH 2/3] Added zsh as default shell to devcontainer; --- .devcontainer/devcontainer.json | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index ad4c73b..909ed2f 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -18,8 +18,13 @@ } }, "features": { - "ghcr.io/devcontainers/features/docker-in-docker:2": {} + "ghcr.io/devcontainers/features/docker-in-docker:2": {}, + "ghcr.io/braun-daniel/devcontainer-features/fzf:1": {}, + "ghcr.io/braun-daniel/devcontainer-features/spaceship:1": {} }, "remoteUser": "node", - "updateContentCommand": "npm install -g @devcontainers/cli" + "updateContentCommand": "npm install -g @devcontainers/cli", + "containerEnv": { + "SHELL": "/bin/zsh" + } } From c3c5cb72dc8cc392fec7370adb4e29ee8f45abab Mon Sep 17 00:00:00 2001 From: Daniel Braun <7925710+braun-daniel@users.noreply.github.com> Date: Fri, 11 Oct 2024 06:35:31 +0000 Subject: [PATCH 3/3] Updated version; --- src/fzf/devcontainer-feature.json | 2 +- src/spaceship/devcontainer-feature.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/fzf/devcontainer-feature.json b/src/fzf/devcontainer-feature.json index 031c01e..0d1cb5d 100644 --- a/src/fzf/devcontainer-feature.json +++ b/src/fzf/devcontainer-feature.json @@ -1,7 +1,7 @@ { "name": "fzf", "id": "fzf", - "version": "0.0.3", + "version": "1.0.0", "description": "Installs fzf - a command line fuzzy search.", "installsAfter": [ "ghcr.io/devcontainers/features/common-utils" diff --git a/src/spaceship/devcontainer-feature.json b/src/spaceship/devcontainer-feature.json index fd51682..0ba80cf 100644 --- a/src/spaceship/devcontainer-feature.json +++ b/src/spaceship/devcontainer-feature.json @@ -1,7 +1,7 @@ { "name": "Spaceship", "id": "spaceship", - "version": "0.0.3", + "version": "1.0.0", "description": "Installs spaceship-prompt.", "installsAfter": [ "ghcr.io/devcontainers/features/common-utils"