Automated update for script library changes

container-templates/docker-compose/.devcontainer/library-scripts/common-debian.sh

@@ -236,6 +236,15 @@ if [ -t 1 ] && [[ "${TERM_PROGRAM}" = "vscode" || "${TERM_PROGRAM}" = "codespace
     ((sleep 10s; touch "$HOME/.config/vscode-dev-containers/first-run-notice-already-displayed") &)
 fi
 
+# Set the default git editor
+if  [ "${TERM_PROGRAM}" = "vscode" ]; then
+    if [[ -n $(command -v code-insiders) &&  -z $(command -v code) ]]; then 
+        export GIT_EDITOR="code-insiders --wait"
+    else 
+        export GIT_EDITOR="code --wait"
+    fi
+fi
+
 EOF
 )"
 
@@ -302,6 +311,7 @@ __bash_prompt
 
 EOF
 )"
+
 CODESPACES_ZSH="$(cat \
 <<'EOF'
 # Codespaces zsh prompt theme
@@ -322,6 +332,7 @@ ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} "
 ZSH_THEME_GIT_PROMPT_DIRTY=" %{$fg_bold[yellow]%}✗%{$fg_bold[cyan]%})"
 ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg_bold[cyan]%})"
 __zsh_prompt
+
 EOF
 )"
 

container-templates/dockerfile/.devcontainer/library-scripts/common-debian.sh

@@ -236,6 +236,15 @@ if [ -t 1 ] && [[ "${TERM_PROGRAM}" = "vscode" || "${TERM_PROGRAM}" = "codespace
     ((sleep 10s; touch "$HOME/.config/vscode-dev-containers/first-run-notice-already-displayed") &)
 fi
 
+# Set the default git editor
+if  [ "${TERM_PROGRAM}" = "vscode" ]; then
+    if [[ -n $(command -v code-insiders) &&  -z $(command -v code) ]]; then 
+        export GIT_EDITOR="code-insiders --wait"
+    else 
+        export GIT_EDITOR="code --wait"
+    fi
+fi
+
 EOF
 )"
 
@@ -302,6 +311,7 @@ __bash_prompt
 
 EOF
 )"
+
 CODESPACES_ZSH="$(cat \
 <<'EOF'
 # Codespaces zsh prompt theme
@@ -322,6 +332,7 @@ ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} "
 ZSH_THEME_GIT_PROMPT_DIRTY=" %{$fg_bold[yellow]%}✗%{$fg_bold[cyan]%})"
 ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg_bold[cyan]%})"
 __zsh_prompt
+
 EOF
 )"
 

containers/alpine/.devcontainer/library-scripts/common-alpine.sh

@@ -169,6 +169,15 @@ if [ -t 1 ] && [[ "${TERM_PROGRAM}" = "vscode" || "${TERM_PROGRAM}" = "codespace
     ((sleep 10s; touch "$HOME/.config/vscode-dev-containers/first-run-notice-already-displayed") &)
 fi
 
+# Set the default git editor
+if  [ "${TERM_PROGRAM}" = "vscode" ]; then
+    if [[ -n $(command -v code-insiders) &&  -z $(command -v code) ]]; then 
+        export GIT_EDITOR="code-insiders --wait"
+    else 
+        export GIT_EDITOR="code --wait"
+    fi
+fi
+
 EOF
 )"
 
@@ -241,6 +250,7 @@ ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} "
 ZSH_THEME_GIT_PROMPT_DIRTY=" %{$fg_bold[yellow]%}✗%{$fg_bold[cyan]%})"
 ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg_bold[cyan]%})"
 __zsh_prompt
+
 EOF
 )"
 

containers/azure-ansible/.devcontainer/library-scripts/common-debian.sh

@@ -236,6 +236,15 @@ if [ -t 1 ] && [[ "${TERM_PROGRAM}" = "vscode" || "${TERM_PROGRAM}" = "codespace
     ((sleep 10s; touch "$HOME/.config/vscode-dev-containers/first-run-notice-already-displayed") &)
 fi
 
+# Set the default git editor
+if  [ "${TERM_PROGRAM}" = "vscode" ]; then
+    if [[ -n $(command -v code-insiders) &&  -z $(command -v code) ]]; then 
+        export GIT_EDITOR="code-insiders --wait"
+    else 
+        export GIT_EDITOR="code --wait"
+    fi
+fi
+
 EOF
 )"
 
@@ -302,6 +311,7 @@ __bash_prompt
 
 EOF
 )"
+
 CODESPACES_ZSH="$(cat \
 <<'EOF'
 # Codespaces zsh prompt theme
@@ -322,6 +332,7 @@ ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} "
 ZSH_THEME_GIT_PROMPT_DIRTY=" %{$fg_bold[yellow]%}✗%{$fg_bold[cyan]%})"
 ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg_bold[cyan]%})"
 __zsh_prompt
+
 EOF
 )"
 

containers/azure-bicep/.devcontainer/library-scripts/common-debian.sh

@@ -236,6 +236,15 @@ if [ -t 1 ] && [[ "${TERM_PROGRAM}" = "vscode" || "${TERM_PROGRAM}" = "codespace
     ((sleep 10s; touch "$HOME/.config/vscode-dev-containers/first-run-notice-already-displayed") &)
 fi
 
+# Set the default git editor
+if  [ "${TERM_PROGRAM}" = "vscode" ]; then
+    if [[ -n $(command -v code-insiders) &&  -z $(command -v code) ]]; then 
+        export GIT_EDITOR="code-insiders --wait"
+    else 
+        export GIT_EDITOR="code --wait"
+    fi
+fi
+
 EOF
 )"
 
@@ -302,6 +311,7 @@ __bash_prompt
 
 EOF
 )"
+
 CODESPACES_ZSH="$(cat \
 <<'EOF'
 # Codespaces zsh prompt theme
@@ -322,6 +332,7 @@ ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} "
 ZSH_THEME_GIT_PROMPT_DIRTY=" %{$fg_bold[yellow]%}✗%{$fg_bold[cyan]%})"
 ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg_bold[cyan]%})"
 __zsh_prompt
+
 EOF
 )"
 

containers/azure-cli/.devcontainer/library-scripts/common-debian.sh

@@ -236,6 +236,15 @@ if [ -t 1 ] && [[ "${TERM_PROGRAM}" = "vscode" || "${TERM_PROGRAM}" = "codespace
     ((sleep 10s; touch "$HOME/.config/vscode-dev-containers/first-run-notice-already-displayed") &)
 fi
 
+# Set the default git editor
+if  [ "${TERM_PROGRAM}" = "vscode" ]; then
+    if [[ -n $(command -v code-insiders) &&  -z $(command -v code) ]]; then 
+        export GIT_EDITOR="code-insiders --wait"
+    else 
+        export GIT_EDITOR="code --wait"
+    fi
+fi
+
 EOF
 )"
 
@@ -302,6 +311,7 @@ __bash_prompt
 
 EOF
 )"
+
 CODESPACES_ZSH="$(cat \
 <<'EOF'
 # Codespaces zsh prompt theme
@@ -322,6 +332,7 @@ ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} "
 ZSH_THEME_GIT_PROMPT_DIRTY=" %{$fg_bold[yellow]%}✗%{$fg_bold[cyan]%})"
 ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg_bold[cyan]%})"
 __zsh_prompt
+
 EOF
 )"
 

containers/azure-functions-dotnetcore-2.1/.devcontainer/library-scripts/common-debian.sh

@@ -236,6 +236,15 @@ if [ -t 1 ] && [[ "${TERM_PROGRAM}" = "vscode" || "${TERM_PROGRAM}" = "codespace
     ((sleep 10s; touch "$HOME/.config/vscode-dev-containers/first-run-notice-already-displayed") &)
 fi
 
+# Set the default git editor
+if  [ "${TERM_PROGRAM}" = "vscode" ]; then
+    if [[ -n $(command -v code-insiders) &&  -z $(command -v code) ]]; then 
+        export GIT_EDITOR="code-insiders --wait"
+    else 
+        export GIT_EDITOR="code --wait"
+    fi
+fi
+
 EOF
 )"
 
@@ -302,6 +311,7 @@ __bash_prompt
 
 EOF
 )"
+
 CODESPACES_ZSH="$(cat \
 <<'EOF'
 # Codespaces zsh prompt theme
@@ -322,6 +332,7 @@ ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} "
 ZSH_THEME_GIT_PROMPT_DIRTY=" %{$fg_bold[yellow]%}✗%{$fg_bold[cyan]%})"
 ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg_bold[cyan]%})"
 __zsh_prompt
+
 EOF
 )"
 

containers/azure-terraform/.devcontainer/library-scripts/common-debian.sh

@@ -236,6 +236,15 @@ if [ -t 1 ] && [[ "${TERM_PROGRAM}" = "vscode" || "${TERM_PROGRAM}" = "codespace
     ((sleep 10s; touch "$HOME/.config/vscode-dev-containers/first-run-notice-already-displayed") &)
 fi
 
+# Set the default git editor
+if  [ "${TERM_PROGRAM}" = "vscode" ]; then
+    if [[ -n $(command -v code-insiders) &&  -z $(command -v code) ]]; then 
+        export GIT_EDITOR="code-insiders --wait"
+    else 
+        export GIT_EDITOR="code --wait"
+    fi
+fi
+
 EOF
 )"
 
@@ -302,6 +311,7 @@ __bash_prompt
 
 EOF
 )"
+
 CODESPACES_ZSH="$(cat \
 <<'EOF'
 # Codespaces zsh prompt theme
@@ -322,6 +332,7 @@ ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} "
 ZSH_THEME_GIT_PROMPT_DIRTY=" %{$fg_bold[yellow]%}✗%{$fg_bold[cyan]%})"
 ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg_bold[cyan]%})"
 __zsh_prompt
+
 EOF
 )"
 

containers/bazel/.devcontainer/library-scripts/common-debian.sh

@@ -236,6 +236,15 @@ if [ -t 1 ] && [[ "${TERM_PROGRAM}" = "vscode" || "${TERM_PROGRAM}" = "codespace
     ((sleep 10s; touch "$HOME/.config/vscode-dev-containers/first-run-notice-already-displayed") &)
 fi
 
+# Set the default git editor
+if  [ "${TERM_PROGRAM}" = "vscode" ]; then
+    if [[ -n $(command -v code-insiders) &&  -z $(command -v code) ]]; then 
+        export GIT_EDITOR="code-insiders --wait"
+    else 
+        export GIT_EDITOR="code --wait"
+    fi
+fi
+
 EOF
 )"
 
@@ -302,6 +311,7 @@ __bash_prompt
 
 EOF
 )"
+
 CODESPACES_ZSH="$(cat \
 <<'EOF'
 # Codespaces zsh prompt theme
@@ -322,6 +332,7 @@ ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} "
 ZSH_THEME_GIT_PROMPT_DIRTY=" %{$fg_bold[yellow]%}✗%{$fg_bold[cyan]%})"
 ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg_bold[cyan]%})"
 __zsh_prompt
+
 EOF
 )"
 

containers/codespaces-linux/.devcontainer/library-scripts/ruby-debian.sh

@@ -101,7 +101,7 @@ else
     until [ "${GPG_OK}" = "true" ] || [ "${RETRY_COUNT}" -eq "5" ]; 
     do
         echo "(*) Downloading GPG key..."
-        gpg --keyserver hkp://pool.sks-keyservers.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB 2>&1 && GPG_OK="true"
+        gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB 2>&1 && GPG_OK="true"
         if [ "${GPG_OK}" != "true" ]; then
             echo "(*) Failed getting key, retring in 10s..."
             (( RETRY_COUNT++ ))

containers/dart/.devcontainer/library-scripts/common-debian.sh

@@ -236,6 +236,15 @@ if [ -t 1 ] && [[ "${TERM_PROGRAM}" = "vscode" || "${TERM_PROGRAM}" = "codespace
     ((sleep 10s; touch "$HOME/.config/vscode-dev-containers/first-run-notice-already-displayed") &)
 fi
 
+# Set the default git editor
+if  [ "${TERM_PROGRAM}" = "vscode" ]; then
+    if [[ -n $(command -v code-insiders) &&  -z $(command -v code) ]]; then 
+        export GIT_EDITOR="code-insiders --wait"
+    else 
+        export GIT_EDITOR="code --wait"
+    fi
+fi
+
 EOF
 )"
 
@@ -302,6 +311,7 @@ __bash_prompt
 
 EOF
 )"
+
 CODESPACES_ZSH="$(cat \
 <<'EOF'
 # Codespaces zsh prompt theme
@@ -322,6 +332,7 @@ ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} "
 ZSH_THEME_GIT_PROMPT_DIRTY=" %{$fg_bold[yellow]%}✗%{$fg_bold[cyan]%})"
 ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg_bold[cyan]%})"
 __zsh_prompt
+
 EOF
 )"
 

containers/debian/.devcontainer/library-scripts/common-debian.sh

@@ -236,6 +236,15 @@ if [ -t 1 ] && [[ "${TERM_PROGRAM}" = "vscode" || "${TERM_PROGRAM}" = "codespace
     ((sleep 10s; touch "$HOME/.config/vscode-dev-containers/first-run-notice-already-displayed") &)
 fi
 
+# Set the default git editor
+if  [ "${TERM_PROGRAM}" = "vscode" ]; then
+    if [[ -n $(command -v code-insiders) &&  -z $(command -v code) ]]; then 
+        export GIT_EDITOR="code-insiders --wait"
+    else 
+        export GIT_EDITOR="code --wait"
+    fi
+fi
+
 EOF
 )"
 
@@ -302,6 +311,7 @@ __bash_prompt
 
 EOF
 )"
+
 CODESPACES_ZSH="$(cat \
 <<'EOF'
 # Codespaces zsh prompt theme
@@ -322,6 +332,7 @@ ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} "
 ZSH_THEME_GIT_PROMPT_DIRTY=" %{$fg_bold[yellow]%}✗%{$fg_bold[cyan]%})"
 ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg_bold[cyan]%})"
 __zsh_prompt
+
 EOF
 )"
 

containers/docker-from-docker-compose/.devcontainer/library-scripts/common-debian.sh

@@ -236,6 +236,15 @@ if [ -t 1 ] && [[ "${TERM_PROGRAM}" = "vscode" || "${TERM_PROGRAM}" = "codespace
     ((sleep 10s; touch "$HOME/.config/vscode-dev-containers/first-run-notice-already-displayed") &)
 fi
 
+# Set the default git editor
+if  [ "${TERM_PROGRAM}" = "vscode" ]; then
+    if [[ -n $(command -v code-insiders) &&  -z $(command -v code) ]]; then 
+        export GIT_EDITOR="code-insiders --wait"
+    else 
+        export GIT_EDITOR="code --wait"
+    fi
+fi
+
 EOF
 )"
 
@@ -302,6 +311,7 @@ __bash_prompt
 
 EOF
 )"
+
 CODESPACES_ZSH="$(cat \
 <<'EOF'
 # Codespaces zsh prompt theme
@@ -322,6 +332,7 @@ ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} "
 ZSH_THEME_GIT_PROMPT_DIRTY=" %{$fg_bold[yellow]%}✗%{$fg_bold[cyan]%})"
 ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg_bold[cyan]%})"
 __zsh_prompt
+
 EOF
 )"
 

containers/docker-from-docker/.devcontainer/library-scripts/common-debian.sh

@@ -236,6 +236,15 @@ if [ -t 1 ] && [[ "${TERM_PROGRAM}" = "vscode" || "${TERM_PROGRAM}" = "codespace
     ((sleep 10s; touch "$HOME/.config/vscode-dev-containers/first-run-notice-already-displayed") &)
 fi
 
+# Set the default git editor
+if  [ "${TERM_PROGRAM}" = "vscode" ]; then
+    if [[ -n $(command -v code-insiders) &&  -z $(command -v code) ]]; then 
+        export GIT_EDITOR="code-insiders --wait"
+    else 
+        export GIT_EDITOR="code --wait"
+    fi
+fi
+
 EOF
 )"
 
@@ -302,6 +311,7 @@ __bash_prompt
 
 EOF
 )"
+
 CODESPACES_ZSH="$(cat \
 <<'EOF'
 # Codespaces zsh prompt theme
@@ -322,6 +332,7 @@ ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} "
 ZSH_THEME_GIT_PROMPT_DIRTY=" %{$fg_bold[yellow]%}✗%{$fg_bold[cyan]%})"
 ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg_bold[cyan]%})"
 __zsh_prompt
+
 EOF
 )"
 

containers/docker-in-docker/.devcontainer/library-scripts/common-debian.sh

@@ -236,6 +236,15 @@ if [ -t 1 ] && [[ "${TERM_PROGRAM}" = "vscode" || "${TERM_PROGRAM}" = "codespace
     ((sleep 10s; touch "$HOME/.config/vscode-dev-containers/first-run-notice-already-displayed") &)
 fi
 
+# Set the default git editor
+if  [ "${TERM_PROGRAM}" = "vscode" ]; then
+    if [[ -n $(command -v code-insiders) &&  -z $(command -v code) ]]; then 
+        export GIT_EDITOR="code-insiders --wait"
+    else 
+        export GIT_EDITOR="code --wait"
+    fi
+fi
+
 EOF
 )"
 
@@ -302,6 +311,7 @@ __bash_prompt
 
 EOF
 )"
+
 CODESPACES_ZSH="$(cat \
 <<'EOF'
 # Codespaces zsh prompt theme
@@ -322,6 +332,7 @@ ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} "
 ZSH_THEME_GIT_PROMPT_DIRTY=" %{$fg_bold[yellow]%}✗%{$fg_bold[cyan]%})"
 ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg_bold[cyan]%})"
 __zsh_prompt
+
 EOF
 )"
 

containers/dotnet/.devcontainer/library-scripts/common-debian.sh

@@ -236,6 +236,15 @@ if [ -t 1 ] && [[ "${TERM_PROGRAM}" = "vscode" || "${TERM_PROGRAM}" = "codespace
     ((sleep 10s; touch "$HOME/.config/vscode-dev-containers/first-run-notice-already-displayed") &)
 fi
 
+# Set the default git editor
+if  [ "${TERM_PROGRAM}" = "vscode" ]; then
+    if [[ -n $(command -v code-insiders) &&  -z $(command -v code) ]]; then 
+        export GIT_EDITOR="code-insiders --wait"
+    else 
+        export GIT_EDITOR="code --wait"
+    fi
+fi
+
 EOF
 )"
 
@@ -302,6 +311,7 @@ __bash_prompt
 
 EOF
 )"
+
 CODESPACES_ZSH="$(cat \
 <<'EOF'
 # Codespaces zsh prompt theme
@@ -322,6 +332,7 @@ ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} "
 ZSH_THEME_GIT_PROMPT_DIRTY=" %{$fg_bold[yellow]%}✗%{$fg_bold[cyan]%})"
 ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg_bold[cyan]%})"
 __zsh_prompt
+
 EOF
 )"
 

containers/go/.devcontainer/library-scripts/common-debian.sh

@@ -236,6 +236,15 @@ if [ -t 1 ] && [[ "${TERM_PROGRAM}" = "vscode" || "${TERM_PROGRAM}" = "codespace
     ((sleep 10s; touch "$HOME/.config/vscode-dev-containers/first-run-notice-already-displayed") &)
 fi
 
+# Set the default git editor
+if  [ "${TERM_PROGRAM}" = "vscode" ]; then
+    if [[ -n $(command -v code-insiders) &&  -z $(command -v code) ]]; then 
+        export GIT_EDITOR="code-insiders --wait"
+    else 
+        export GIT_EDITOR="code --wait"
+    fi
+fi
+
 EOF
 )"
 
@@ -302,6 +311,7 @@ __bash_prompt
 
 EOF
 )"
+
 CODESPACES_ZSH="$(cat \
 <<'EOF'
 # Codespaces zsh prompt theme
@@ -322,6 +332,7 @@ ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} "
 ZSH_THEME_GIT_PROMPT_DIRTY=" %{$fg_bold[yellow]%}✗%{$fg_bold[cyan]%})"
 ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg_bold[cyan]%})"
 __zsh_prompt
+
 EOF
 )"
 

containers/java/.devcontainer/library-scripts/common-debian.sh

@@ -236,6 +236,15 @@ if [ -t 1 ] && [[ "${TERM_PROGRAM}" = "vscode" || "${TERM_PROGRAM}" = "codespace
     ((sleep 10s; touch "$HOME/.config/vscode-dev-containers/first-run-notice-already-displayed") &)
 fi
 
+# Set the default git editor
+if  [ "${TERM_PROGRAM}" = "vscode" ]; then
+    if [[ -n $(command -v code-insiders) &&  -z $(command -v code) ]]; then 
+        export GIT_EDITOR="code-insiders --wait"
+    else 
+        export GIT_EDITOR="code --wait"
+    fi
+fi
+
 EOF
 )"
 
@@ -302,6 +311,7 @@ __bash_prompt
 
 EOF
 )"
+
 CODESPACES_ZSH="$(cat \
 <<'EOF'
 # Codespaces zsh prompt theme
@@ -322,6 +332,7 @@ ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} "
 ZSH_THEME_GIT_PROMPT_DIRTY=" %{$fg_bold[yellow]%}✗%{$fg_bold[cyan]%})"
 ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg_bold[cyan]%})"
 __zsh_prompt
+
 EOF
 )"
 

containers/javascript-node/.devcontainer/library-scripts/common-debian.sh

@@ -236,6 +236,15 @@ if [ -t 1 ] && [[ "${TERM_PROGRAM}" = "vscode" || "${TERM_PROGRAM}" = "codespace
     ((sleep 10s; touch "$HOME/.config/vscode-dev-containers/first-run-notice-already-displayed") &)
 fi
 
+# Set the default git editor
+if  [ "${TERM_PROGRAM}" = "vscode" ]; then
+    if [[ -n $(command -v code-insiders) &&  -z $(command -v code) ]]; then 
+        export GIT_EDITOR="code-insiders --wait"
+    else 
+        export GIT_EDITOR="code --wait"
+    fi
+fi
+
 EOF
 )"
 
@@ -302,6 +311,7 @@ __bash_prompt
 
 EOF
 )"
+
 CODESPACES_ZSH="$(cat \
 <<'EOF'
 # Codespaces zsh prompt theme
@@ -322,6 +332,7 @@ ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} "
 ZSH_THEME_GIT_PROMPT_DIRTY=" %{$fg_bold[yellow]%}✗%{$fg_bold[cyan]%})"
 ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg_bold[cyan]%})"
 __zsh_prompt
+
 EOF
 )"
 

containers/jupyter-datascience-notebooks/.devcontainer/library-scripts/common-debian.sh

@@ -236,6 +236,15 @@ if [ -t 1 ] && [[ "${TERM_PROGRAM}" = "vscode" || "${TERM_PROGRAM}" = "codespace
     ((sleep 10s; touch "$HOME/.config/vscode-dev-containers/first-run-notice-already-displayed") &)
 fi
 
+# Set the default git editor
+if  [ "${TERM_PROGRAM}" = "vscode" ]; then
+    if [[ -n $(command -v code-insiders) &&  -z $(command -v code) ]]; then 
+        export GIT_EDITOR="code-insiders --wait"
+    else 
+        export GIT_EDITOR="code --wait"
+    fi
+fi
+
 EOF
 )"
 
@@ -302,6 +311,7 @@ __bash_prompt
 
 EOF
 )"
+
 CODESPACES_ZSH="$(cat \
 <<'EOF'
 # Codespaces zsh prompt theme
@@ -322,6 +332,7 @@ ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} "
 ZSH_THEME_GIT_PROMPT_DIRTY=" %{$fg_bold[yellow]%}✗%{$fg_bold[cyan]%})"
 ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg_bold[cyan]%})"
 __zsh_prompt
+
 EOF
 )"
 

containers/kubernetes-helm-minikube/.devcontainer/library-scripts/common-debian.sh

@@ -236,6 +236,15 @@ if [ -t 1 ] && [[ "${TERM_PROGRAM}" = "vscode" || "${TERM_PROGRAM}" = "codespace
     ((sleep 10s; touch "$HOME/.config/vscode-dev-containers/first-run-notice-already-displayed") &)
 fi
 
+# Set the default git editor
+if  [ "${TERM_PROGRAM}" = "vscode" ]; then
+    if [[ -n $(command -v code-insiders) &&  -z $(command -v code) ]]; then 
+        export GIT_EDITOR="code-insiders --wait"
+    else 
+        export GIT_EDITOR="code --wait"
+    fi
+fi
+
 EOF
 )"
 
@@ -302,6 +311,7 @@ __bash_prompt
 
 EOF
 )"
+
 CODESPACES_ZSH="$(cat \
 <<'EOF'
 # Codespaces zsh prompt theme
@@ -322,6 +332,7 @@ ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} "
 ZSH_THEME_GIT_PROMPT_DIRTY=" %{$fg_bold[yellow]%}✗%{$fg_bold[cyan]%})"
 ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg_bold[cyan]%})"
 __zsh_prompt
+
 EOF
 )"
 

containers/kubernetes-helm/.devcontainer/library-scripts/common-debian.sh

@@ -236,6 +236,15 @@ if [ -t 1 ] && [[ "${TERM_PROGRAM}" = "vscode" || "${TERM_PROGRAM}" = "codespace
     ((sleep 10s; touch "$HOME/.config/vscode-dev-containers/first-run-notice-already-displayed") &)
 fi
 
+# Set the default git editor
+if  [ "${TERM_PROGRAM}" = "vscode" ]; then
+    if [[ -n $(command -v code-insiders) &&  -z $(command -v code) ]]; then 
+        export GIT_EDITOR="code-insiders --wait"
+    else 
+        export GIT_EDITOR="code --wait"
+    fi
+fi
+
 EOF
 )"
 
@@ -302,6 +311,7 @@ __bash_prompt
 
 EOF
 )"
+
 CODESPACES_ZSH="$(cat \
 <<'EOF'
 # Codespaces zsh prompt theme
@@ -322,6 +332,7 @@ ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} "
 ZSH_THEME_GIT_PROMPT_DIRTY=" %{$fg_bold[yellow]%}✗%{$fg_bold[cyan]%})"
 ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg_bold[cyan]%})"
 __zsh_prompt
+
 EOF
 )"
 

containers/mit-scheme/.devcontainer/library-scripts/common-debian.sh

@@ -236,6 +236,15 @@ if [ -t 1 ] && [[ "${TERM_PROGRAM}" = "vscode" || "${TERM_PROGRAM}" = "codespace
     ((sleep 10s; touch "$HOME/.config/vscode-dev-containers/first-run-notice-already-displayed") &)
 fi
 
+# Set the default git editor
+if  [ "${TERM_PROGRAM}" = "vscode" ]; then
+    if [[ -n $(command -v code-insiders) &&  -z $(command -v code) ]]; then 
+        export GIT_EDITOR="code-insiders --wait"
+    else 
+        export GIT_EDITOR="code --wait"
+    fi
+fi
+
 EOF
 )"
 
@@ -302,6 +311,7 @@ __bash_prompt
 
 EOF
 )"
+
 CODESPACES_ZSH="$(cat \
 <<'EOF'
 # Codespaces zsh prompt theme
@@ -322,6 +332,7 @@ ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} "
 ZSH_THEME_GIT_PROMPT_DIRTY=" %{$fg_bold[yellow]%}✗%{$fg_bold[cyan]%})"
 ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg_bold[cyan]%})"
 __zsh_prompt
+
 EOF
 )"
 

containers/perl/.devcontainer/library-scripts/common-debian.sh

@@ -236,6 +236,15 @@ if [ -t 1 ] && [[ "${TERM_PROGRAM}" = "vscode" || "${TERM_PROGRAM}" = "codespace
     ((sleep 10s; touch "$HOME/.config/vscode-dev-containers/first-run-notice-already-displayed") &)
 fi
 
+# Set the default git editor
+if  [ "${TERM_PROGRAM}" = "vscode" ]; then
+    if [[ -n $(command -v code-insiders) &&  -z $(command -v code) ]]; then 
+        export GIT_EDITOR="code-insiders --wait"
+    else 
+        export GIT_EDITOR="code --wait"
+    fi
+fi
+
 EOF
 )"
 
@@ -302,6 +311,7 @@ __bash_prompt
 
 EOF
 )"
+
 CODESPACES_ZSH="$(cat \
 <<'EOF'
 # Codespaces zsh prompt theme
@@ -322,6 +332,7 @@ ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} "
 ZSH_THEME_GIT_PROMPT_DIRTY=" %{$fg_bold[yellow]%}✗%{$fg_bold[cyan]%})"
 ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg_bold[cyan]%})"
 __zsh_prompt
+
 EOF
 )"
 

containers/php/.devcontainer/library-scripts/common-debian.sh

@@ -236,6 +236,15 @@ if [ -t 1 ] && [[ "${TERM_PROGRAM}" = "vscode" || "${TERM_PROGRAM}" = "codespace
     ((sleep 10s; touch "$HOME/.config/vscode-dev-containers/first-run-notice-already-displayed") &)
 fi
 
+# Set the default git editor
+if  [ "${TERM_PROGRAM}" = "vscode" ]; then
+    if [[ -n $(command -v code-insiders) &&  -z $(command -v code) ]]; then 
+        export GIT_EDITOR="code-insiders --wait"
+    else 
+        export GIT_EDITOR="code --wait"
+    fi
+fi
+
 EOF
 )"
 
@@ -302,6 +311,7 @@ __bash_prompt
 
 EOF
 )"
+
 CODESPACES_ZSH="$(cat \
 <<'EOF'
 # Codespaces zsh prompt theme
@@ -322,6 +332,7 @@ ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} "
 ZSH_THEME_GIT_PROMPT_DIRTY=" %{$fg_bold[yellow]%}✗%{$fg_bold[cyan]%})"
 ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg_bold[cyan]%})"
 __zsh_prompt
+
 EOF
 )"
 

containers/powershell/.devcontainer/library-scripts/common-debian.sh

@@ -236,6 +236,15 @@ if [ -t 1 ] && [[ "${TERM_PROGRAM}" = "vscode" || "${TERM_PROGRAM}" = "codespace
     ((sleep 10s; touch "$HOME/.config/vscode-dev-containers/first-run-notice-already-displayed") &)
 fi
 
+# Set the default git editor
+if  [ "${TERM_PROGRAM}" = "vscode" ]; then
+    if [[ -n $(command -v code-insiders) &&  -z $(command -v code) ]]; then 
+        export GIT_EDITOR="code-insiders --wait"
+    else 
+        export GIT_EDITOR="code --wait"
+    fi
+fi
+
 EOF
 )"
 
@@ -302,6 +311,7 @@ __bash_prompt
 
 EOF
 )"
+
 CODESPACES_ZSH="$(cat \
 <<'EOF'
 # Codespaces zsh prompt theme
@@ -322,6 +332,7 @@ ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} "
 ZSH_THEME_GIT_PROMPT_DIRTY=" %{$fg_bold[yellow]%}✗%{$fg_bold[cyan]%})"
 ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg_bold[cyan]%})"
 __zsh_prompt
+
 EOF
 )"
 

containers/python-3-anaconda/.devcontainer/library-scripts/common-debian.sh

@@ -236,6 +236,15 @@ if [ -t 1 ] && [[ "${TERM_PROGRAM}" = "vscode" || "${TERM_PROGRAM}" = "codespace
     ((sleep 10s; touch "$HOME/.config/vscode-dev-containers/first-run-notice-already-displayed") &)
 fi
 
+# Set the default git editor
+if  [ "${TERM_PROGRAM}" = "vscode" ]; then
+    if [[ -n $(command -v code-insiders) &&  -z $(command -v code) ]]; then 
+        export GIT_EDITOR="code-insiders --wait"
+    else 
+        export GIT_EDITOR="code --wait"
+    fi
+fi
+
 EOF
 )"
 
@@ -302,6 +311,7 @@ __bash_prompt
 
 EOF
 )"
+
 CODESPACES_ZSH="$(cat \
 <<'EOF'
 # Codespaces zsh prompt theme
@@ -322,6 +332,7 @@ ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} "
 ZSH_THEME_GIT_PROMPT_DIRTY=" %{$fg_bold[yellow]%}✗%{$fg_bold[cyan]%})"
 ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg_bold[cyan]%})"
 __zsh_prompt
+
 EOF
 )"
 

containers/python-3-miniconda/.devcontainer/library-scripts/common-debian.sh

@@ -236,6 +236,15 @@ if [ -t 1 ] && [[ "${TERM_PROGRAM}" = "vscode" || "${TERM_PROGRAM}" = "codespace
     ((sleep 10s; touch "$HOME/.config/vscode-dev-containers/first-run-notice-already-displayed") &)
 fi
 
+# Set the default git editor
+if  [ "${TERM_PROGRAM}" = "vscode" ]; then
+    if [[ -n $(command -v code-insiders) &&  -z $(command -v code) ]]; then 
+        export GIT_EDITOR="code-insiders --wait"
+    else 
+        export GIT_EDITOR="code --wait"
+    fi
+fi
+
 EOF
 )"
 
@@ -302,6 +311,7 @@ __bash_prompt
 
 EOF
 )"
+
 CODESPACES_ZSH="$(cat \
 <<'EOF'
 # Codespaces zsh prompt theme
@@ -322,6 +332,7 @@ ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} "
 ZSH_THEME_GIT_PROMPT_DIRTY=" %{$fg_bold[yellow]%}✗%{$fg_bold[cyan]%})"
 ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg_bold[cyan]%})"
 __zsh_prompt
+
 EOF
 )"
 

containers/python-3-pypy/.devcontainer/library-scripts/common-debian.sh

@@ -236,6 +236,15 @@ if [ -t 1 ] && [[ "${TERM_PROGRAM}" = "vscode" || "${TERM_PROGRAM}" = "codespace
     ((sleep 10s; touch "$HOME/.config/vscode-dev-containers/first-run-notice-already-displayed") &)
 fi
 
+# Set the default git editor
+if  [ "${TERM_PROGRAM}" = "vscode" ]; then
+    if [[ -n $(command -v code-insiders) &&  -z $(command -v code) ]]; then 
+        export GIT_EDITOR="code-insiders --wait"
+    else 
+        export GIT_EDITOR="code --wait"
+    fi
+fi
+
 EOF
 )"
 
@@ -302,6 +311,7 @@ __bash_prompt
 
 EOF
 )"
+
 CODESPACES_ZSH="$(cat \
 <<'EOF'
 # Codespaces zsh prompt theme
@@ -322,6 +332,7 @@ ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} "
 ZSH_THEME_GIT_PROMPT_DIRTY=" %{$fg_bold[yellow]%}✗%{$fg_bold[cyan]%})"
 ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg_bold[cyan]%})"
 __zsh_prompt
+
 EOF
 )"
 

containers/python-3/.devcontainer/library-scripts/common-debian.sh

@@ -236,6 +236,15 @@ if [ -t 1 ] && [[ "${TERM_PROGRAM}" = "vscode" || "${TERM_PROGRAM}" = "codespace
     ((sleep 10s; touch "$HOME/.config/vscode-dev-containers/first-run-notice-already-displayed") &)
 fi
 
+# Set the default git editor
+if  [ "${TERM_PROGRAM}" = "vscode" ]; then
+    if [[ -n $(command -v code-insiders) &&  -z $(command -v code) ]]; then 
+        export GIT_EDITOR="code-insiders --wait"
+    else 
+        export GIT_EDITOR="code --wait"
+    fi
+fi
+
 EOF
 )"
 
@@ -302,6 +311,7 @@ __bash_prompt
 
 EOF
 )"
+
 CODESPACES_ZSH="$(cat \
 <<'EOF'
 # Codespaces zsh prompt theme
@@ -322,6 +332,7 @@ ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} "
 ZSH_THEME_GIT_PROMPT_DIRTY=" %{$fg_bold[yellow]%}✗%{$fg_bold[cyan]%})"
 ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg_bold[cyan]%})"
 __zsh_prompt
+
 EOF
 )"
 

containers/r/.devcontainer/library-scripts/common-debian.sh

@@ -236,6 +236,15 @@ if [ -t 1 ] && [[ "${TERM_PROGRAM}" = "vscode" || "${TERM_PROGRAM}" = "codespace
     ((sleep 10s; touch "$HOME/.config/vscode-dev-containers/first-run-notice-already-displayed") &)
 fi
 
+# Set the default git editor
+if  [ "${TERM_PROGRAM}" = "vscode" ]; then
+    if [[ -n $(command -v code-insiders) &&  -z $(command -v code) ]]; then 
+        export GIT_EDITOR="code-insiders --wait"
+    else 
+        export GIT_EDITOR="code --wait"
+    fi
+fi
+
 EOF
 )"
 
@@ -302,6 +311,7 @@ __bash_prompt
 
 EOF
 )"
+
 CODESPACES_ZSH="$(cat \
 <<'EOF'
 # Codespaces zsh prompt theme
@@ -322,6 +332,7 @@ ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} "
 ZSH_THEME_GIT_PROMPT_DIRTY=" %{$fg_bold[yellow]%}✗%{$fg_bold[cyan]%})"
 ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg_bold[cyan]%})"
 __zsh_prompt
+
 EOF
 )"
 

containers/ruby/.devcontainer/library-scripts/common-debian.sh

@@ -236,6 +236,15 @@ if [ -t 1 ] && [[ "${TERM_PROGRAM}" = "vscode" || "${TERM_PROGRAM}" = "codespace
     ((sleep 10s; touch "$HOME/.config/vscode-dev-containers/first-run-notice-already-displayed") &)
 fi
 
+# Set the default git editor
+if  [ "${TERM_PROGRAM}" = "vscode" ]; then
+    if [[ -n $(command -v code-insiders) &&  -z $(command -v code) ]]; then 
+        export GIT_EDITOR="code-insiders --wait"
+    else 
+        export GIT_EDITOR="code --wait"
+    fi
+fi
+
 EOF
 )"
 
@@ -302,6 +311,7 @@ __bash_prompt
 
 EOF
 )"
+
 CODESPACES_ZSH="$(cat \
 <<'EOF'
 # Codespaces zsh prompt theme
@@ -322,6 +332,7 @@ ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} "
 ZSH_THEME_GIT_PROMPT_DIRTY=" %{$fg_bold[yellow]%}✗%{$fg_bold[cyan]%})"
 ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg_bold[cyan]%})"
 __zsh_prompt
+
 EOF
 )"
 

containers/ruby/.devcontainer/library-scripts/ruby-debian.sh

@@ -101,7 +101,7 @@ else
     until [ "${GPG_OK}" = "true" ] || [ "${RETRY_COUNT}" -eq "5" ]; 
     do
         echo "(*) Downloading GPG key..."
-        gpg --keyserver hkp://pool.sks-keyservers.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB 2>&1 && GPG_OK="true"
+        gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB 2>&1 && GPG_OK="true"
         if [ "${GPG_OK}" != "true" ]; then
             echo "(*) Failed getting key, retring in 10s..."
             (( RETRY_COUNT++ ))

containers/rust/.devcontainer/library-scripts/common-debian.sh

@@ -236,6 +236,15 @@ if [ -t 1 ] && [[ "${TERM_PROGRAM}" = "vscode" || "${TERM_PROGRAM}" = "codespace
     ((sleep 10s; touch "$HOME/.config/vscode-dev-containers/first-run-notice-already-displayed") &)
 fi
 
+# Set the default git editor
+if  [ "${TERM_PROGRAM}" = "vscode" ]; then
+    if [[ -n $(command -v code-insiders) &&  -z $(command -v code) ]]; then 
+        export GIT_EDITOR="code-insiders --wait"
+    else 
+        export GIT_EDITOR="code --wait"
+    fi
+fi
+
 EOF
 )"
 
@@ -302,6 +311,7 @@ __bash_prompt
 
 EOF
 )"
+
 CODESPACES_ZSH="$(cat \
 <<'EOF'
 # Codespaces zsh prompt theme
@@ -322,6 +332,7 @@ ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} "
 ZSH_THEME_GIT_PROMPT_DIRTY=" %{$fg_bold[yellow]%}✗%{$fg_bold[cyan]%})"
 ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg_bold[cyan]%})"
 __zsh_prompt
+
 EOF
 )"
 

containers/swift/.devcontainer/library-scripts/common-debian.sh

@@ -236,6 +236,15 @@ if [ -t 1 ] && [[ "${TERM_PROGRAM}" = "vscode" || "${TERM_PROGRAM}" = "codespace
     ((sleep 10s; touch "$HOME/.config/vscode-dev-containers/first-run-notice-already-displayed") &)
 fi
 
+# Set the default git editor
+if  [ "${TERM_PROGRAM}" = "vscode" ]; then
+    if [[ -n $(command -v code-insiders) &&  -z $(command -v code) ]]; then 
+        export GIT_EDITOR="code-insiders --wait"
+    else 
+        export GIT_EDITOR="code --wait"
+    fi
+fi
+
 EOF
 )"
 
@@ -302,6 +311,7 @@ __bash_prompt
 
 EOF
 )"
+
 CODESPACES_ZSH="$(cat \
 <<'EOF'
 # Codespaces zsh prompt theme
@@ -322,6 +332,7 @@ ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} "
 ZSH_THEME_GIT_PROMPT_DIRTY=" %{$fg_bold[yellow]%}✗%{$fg_bold[cyan]%})"
 ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg_bold[cyan]%})"
 __zsh_prompt
+
 EOF
 )"
 

containers/ubuntu/.devcontainer/library-scripts/common-debian.sh

@@ -236,6 +236,15 @@ if [ -t 1 ] && [[ "${TERM_PROGRAM}" = "vscode" || "${TERM_PROGRAM}" = "codespace
     ((sleep 10s; touch "$HOME/.config/vscode-dev-containers/first-run-notice-already-displayed") &)
 fi
 
+# Set the default git editor
+if  [ "${TERM_PROGRAM}" = "vscode" ]; then
+    if [[ -n $(command -v code-insiders) &&  -z $(command -v code) ]]; then 
+        export GIT_EDITOR="code-insiders --wait"
+    else 
+        export GIT_EDITOR="code --wait"
+    fi
+fi
+
 EOF
 )"
 
@@ -302,6 +311,7 @@ __bash_prompt
 
 EOF
 )"
+
 CODESPACES_ZSH="$(cat \
 <<'EOF'
 # Codespaces zsh prompt theme
@@ -322,6 +332,7 @@ ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} "
 ZSH_THEME_GIT_PROMPT_DIRTY=" %{$fg_bold[yellow]%}✗%{$fg_bold[cyan]%})"
 ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg_bold[cyan]%})"
 __zsh_prompt
+
 EOF
 )"