support debian

nohzafk · Jul 26, 2024 · cc6666d · cc6666d
1 parent 04bfdc7
commit cc6666d
Show file tree

Hide file tree

Showing 150 changed files with 376 additions and 840 deletions.
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -13,23 +13,9 @@ jobs:
     strategy:
       matrix:
         features:
-          - docker-langserver
           - javascript
-          - jedi
-          - jedi_ruff
-          - nil          
-          - pyright
-          - pyright_ruff
-          - pyright-background-analysis
-          - pyright-background-analysis_ruff          
-          - ruff
-          - typescript
+          - basedpyright_ruff
           - typescript_eslint
-          - typescriptreact
-          - typst-lsp
-          - vscode-css-language-server
-          - vscode-eslint-language-server
-          - vscode-html-language-server
           - vscode-json-language-server
         baseImage:
           - debian:latest
@@ -49,11 +35,11 @@ jobs:
   #   continue-on-error: true
   #   strategy:
   #     matrix:
-  #       features:          
-  #         - jedi_ruff        
-  #         - pyright_ruff          
+  #       features:
+  #         - jedi_ruff
+  #         - pyright_ruff
   #         - pyright-background-analysis_ruff
-  #         - typescript_eslint          
+  #         - typescript_eslint
   #   steps:
   #     - uses: actions/checkout@v3
 

diff --git a/_generator/src_template/{{cookiecutter.langserver}}/devcontainer-feature.json b/_generator/src_template/{{cookiecutter.langserver}}/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
   "id": "{{cookiecutter.langserver}}",
-  "version": "0.4.9",
+  "version": "0.4.10",
   "name": "emacs lsp-bridge {{cookiecutter.langserver}} language server",
   "description": "emacs lsp-bridge {{cookiecutter.langserver}} language server environment installed by Nix Pacakge Manager",
   "options": {

diff --git a/_generator/src_template/{{cookiecutter.langserver}}/lsp-bridge-start.sh b/_generator/src_template/{{cookiecutter.langserver}}/lsp-bridge-start.sh
@@ -11,15 +11,9 @@ is_process_running() {
     elif command -v ps >/dev/null 2>&1; then
         ps aux | grep "$PYTHON_CMD.*$LSP_BRIDGE_SCRIPT" | grep -v grep >/dev/null
     else
-        # Fallback to /proc filesystem
-        for pid in /proc/[0-9]*; do
-            if [ -e "$pid/cmdline" ]; then
-                if grep -q "$PYTHON_CMD.*$LSP_BRIDGE_SCRIPT" "$pid/cmdline"; then
-                    return 0
-                fi
-            fi
-        done
-        return 1
+        # no ps under debian:latest
+        apt-get -y update && apt-get -y install procps
+        ps aux | grep "$PYTHON_CMD.*$LSP_BRIDGE_SCRIPT" | grep -v grep >/dev/null
     fi
 }
 
@@ -37,6 +31,7 @@ if ! is_process_running; then
         echo "Start lsp-bridge successfully" | tee -a "$LOG_FILE"
     else
         echo "Start lsp-bridge failed" | tee -a "$LOG_FILE"
+        cat "$LOG_FILE"
         exit 1
     fi
 else

diff --git a/_generator/test.sh b/_generator/test.sh
@@ -17,11 +17,4 @@ devcontainer features test \
   --remote-user vscode \
   --skip-scenarios \
   --base-image mcr.microsoft.com/devcontainers/base:ubuntu \
-  .
-
-devcontainer features test \
-  $FEATURES \
-  --remote-user root \
-  --skip-scenarios \
-  --base-image mcr.microsoft.com/devcontainers/base:debian \
-  .
+  .
diff --git a/src/ansible-language-server/devcontainer-feature.json b/src/ansible-language-server/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
   "id": "ansible-language-server",
-  "version": "0.4.9",
+  "version": "0.4.10",
   "name": "emacs lsp-bridge ansible-language-server language server",
   "description": "emacs lsp-bridge ansible-language-server language server environment installed by Nix Pacakge Manager",
   "options": {

diff --git a/src/ansible-language-server/lsp-bridge-start.sh b/src/ansible-language-server/lsp-bridge-start.sh
@@ -11,15 +11,9 @@ is_process_running() {
     elif command -v ps >/dev/null 2>&1; then
         ps aux | grep "$PYTHON_CMD.*$LSP_BRIDGE_SCRIPT" | grep -v grep >/dev/null
     else
-        # Fallback to /proc filesystem
-        for pid in /proc/[0-9]*; do
-            if [ -e "$pid/cmdline" ]; then
-                if grep -q "$PYTHON_CMD.*$LSP_BRIDGE_SCRIPT" "$pid/cmdline"; then
-                    return 0
-                fi
-            fi
-        done
-        return 1
+        # no ps under debian:latest
+        apt-get -y update && apt-get -y install procps
+        ps aux | grep "$PYTHON_CMD.*$LSP_BRIDGE_SCRIPT" | grep -v grep >/dev/null
     fi
 }
 
@@ -37,9 +31,9 @@ if ! is_process_running; then
         echo "Start lsp-bridge successfully" | tee -a "$LOG_FILE"
     else
         echo "Start lsp-bridge failed" | tee -a "$LOG_FILE"
+        cat "$LOG_FILE"
         exit 1
     fi
 else
     echo "lsp-bridge process is already running" | tee -a "$LOG_FILE"
 fi
-
diff --git a/src/basedpyright/devcontainer-feature.json b/src/basedpyright/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
   "id": "basedpyright",
-  "version": "0.4.9",
+  "version": "0.4.10",
   "name": "emacs lsp-bridge basedpyright language server",
   "description": "emacs lsp-bridge basedpyright language server environment installed by Nix Pacakge Manager",
   "options": {

diff --git a/src/basedpyright/lsp-bridge-start.sh b/src/basedpyright/lsp-bridge-start.sh
@@ -11,15 +11,9 @@ is_process_running() {
     elif command -v ps >/dev/null 2>&1; then
         ps aux | grep "$PYTHON_CMD.*$LSP_BRIDGE_SCRIPT" | grep -v grep >/dev/null
     else
-        # Fallback to /proc filesystem
-        for pid in /proc/[0-9]*; do
-            if [ -e "$pid/cmdline" ]; then
-                if grep -q "$PYTHON_CMD.*$LSP_BRIDGE_SCRIPT" "$pid/cmdline"; then
-                    return 0
-                fi
-            fi
-        done
-        return 1
+        # no ps under debian:latest
+        apt-get -y update && apt-get -y install procps
+        ps aux | grep "$PYTHON_CMD.*$LSP_BRIDGE_SCRIPT" | grep -v grep >/dev/null
     fi
 }
 
@@ -37,9 +31,9 @@ if ! is_process_running; then
         echo "Start lsp-bridge successfully" | tee -a "$LOG_FILE"
     else
         echo "Start lsp-bridge failed" | tee -a "$LOG_FILE"
+        cat "$LOG_FILE"
         exit 1
     fi
 else
     echo "lsp-bridge process is already running" | tee -a "$LOG_FILE"
 fi
-
diff --git a/src/basedpyright_ruff/devcontainer-feature.json b/src/basedpyright_ruff/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
   "id": "basedpyright_ruff",
-  "version": "0.4.9",
+  "version": "0.4.10",
   "name": "emacs lsp-bridge basedpyright_ruff language server",
   "description": "emacs lsp-bridge basedpyright_ruff language server environment installed by Nix Pacakge Manager",
   "options": {

diff --git a/src/basedpyright_ruff/lsp-bridge-start.sh b/src/basedpyright_ruff/lsp-bridge-start.sh
@@ -11,15 +11,9 @@ is_process_running() {
     elif command -v ps >/dev/null 2>&1; then
         ps aux | grep "$PYTHON_CMD.*$LSP_BRIDGE_SCRIPT" | grep -v grep >/dev/null
     else
-        # Fallback to /proc filesystem
-        for pid in /proc/[0-9]*; do
-            if [ -e "$pid/cmdline" ]; then
-                if grep -q "$PYTHON_CMD.*$LSP_BRIDGE_SCRIPT" "$pid/cmdline"; then
-                    return 0
-                fi
-            fi
-        done
-        return 1
+        # no ps under debian:latest
+        apt-get -y update && apt-get -y install procps
+        ps aux | grep "$PYTHON_CMD.*$LSP_BRIDGE_SCRIPT" | grep -v grep >/dev/null
     fi
 }
 
@@ -37,9 +31,9 @@ if ! is_process_running; then
         echo "Start lsp-bridge successfully" | tee -a "$LOG_FILE"
     else
         echo "Start lsp-bridge failed" | tee -a "$LOG_FILE"
+        cat "$LOG_FILE"
         exit 1
     fi
 else
     echo "lsp-bridge process is already running" | tee -a "$LOG_FILE"
 fi
-
diff --git a/src/bash-language-server/devcontainer-feature.json b/src/bash-language-server/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
   "id": "bash-language-server",
-  "version": "0.4.9",
+  "version": "0.4.10",
   "name": "emacs lsp-bridge bash-language-server language server",
   "description": "emacs lsp-bridge bash-language-server language server environment installed by Nix Pacakge Manager",
   "options": {

diff --git a/src/bash-language-server/lsp-bridge-start.sh b/src/bash-language-server/lsp-bridge-start.sh
@@ -11,15 +11,9 @@ is_process_running() {
     elif command -v ps >/dev/null 2>&1; then
         ps aux | grep "$PYTHON_CMD.*$LSP_BRIDGE_SCRIPT" | grep -v grep >/dev/null
     else
-        # Fallback to /proc filesystem
-        for pid in /proc/[0-9]*; do
-            if [ -e "$pid/cmdline" ]; then
-                if grep -q "$PYTHON_CMD.*$LSP_BRIDGE_SCRIPT" "$pid/cmdline"; then
-                    return 0
-                fi
-            fi
-        done
-        return 1
+        # no ps under debian:latest
+        apt-get -y update && apt-get -y install procps
+        ps aux | grep "$PYTHON_CMD.*$LSP_BRIDGE_SCRIPT" | grep -v grep >/dev/null
     fi
 }
 
@@ -37,9 +31,9 @@ if ! is_process_running; then
         echo "Start lsp-bridge successfully" | tee -a "$LOG_FILE"
     else
         echo "Start lsp-bridge failed" | tee -a "$LOG_FILE"
+        cat "$LOG_FILE"
         exit 1
     fi
 else
     echo "lsp-bridge process is already running" | tee -a "$LOG_FILE"
 fi
-
diff --git a/src/beancount-language-server/devcontainer-feature.json b/src/beancount-language-server/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
   "id": "beancount-language-server",
-  "version": "0.4.9",
+  "version": "0.4.10",
   "name": "emacs lsp-bridge beancount-language-server language server",
   "description": "emacs lsp-bridge beancount-language-server language server environment installed by Nix Pacakge Manager",
   "options": {

diff --git a/src/beancount-language-server/lsp-bridge-start.sh b/src/beancount-language-server/lsp-bridge-start.sh
@@ -11,15 +11,9 @@ is_process_running() {
     elif command -v ps >/dev/null 2>&1; then
         ps aux | grep "$PYTHON_CMD.*$LSP_BRIDGE_SCRIPT" | grep -v grep >/dev/null
     else
-        # Fallback to /proc filesystem
-        for pid in /proc/[0-9]*; do
-            if [ -e "$pid/cmdline" ]; then
-                if grep -q "$PYTHON_CMD.*$LSP_BRIDGE_SCRIPT" "$pid/cmdline"; then
-                    return 0
-                fi
-            fi
-        done
-        return 1
+        # no ps under debian:latest
+        apt-get -y update && apt-get -y install procps
+        ps aux | grep "$PYTHON_CMD.*$LSP_BRIDGE_SCRIPT" | grep -v grep >/dev/null
     fi
 }
 
@@ -37,9 +31,9 @@ if ! is_process_running; then
         echo "Start lsp-bridge successfully" | tee -a "$LOG_FILE"
     else
         echo "Start lsp-bridge failed" | tee -a "$LOG_FILE"
+        cat "$LOG_FILE"
         exit 1
     fi
 else
     echo "lsp-bridge process is already running" | tee -a "$LOG_FILE"
 fi
-
diff --git a/src/ccls/devcontainer-feature.json b/src/ccls/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
   "id": "ccls",
-  "version": "0.4.9",
+  "version": "0.4.10",
   "name": "emacs lsp-bridge ccls language server",
   "description": "emacs lsp-bridge ccls language server environment installed by Nix Pacakge Manager",
   "options": {

diff --git a/src/ccls/lsp-bridge-start.sh b/src/ccls/lsp-bridge-start.sh
@@ -11,15 +11,9 @@ is_process_running() {
     elif command -v ps >/dev/null 2>&1; then
         ps aux | grep "$PYTHON_CMD.*$LSP_BRIDGE_SCRIPT" | grep -v grep >/dev/null
     else
-        # Fallback to /proc filesystem
-        for pid in /proc/[0-9]*; do
-            if [ -e "$pid/cmdline" ]; then
-                if grep -q "$PYTHON_CMD.*$LSP_BRIDGE_SCRIPT" "$pid/cmdline"; then
-                    return 0
-                fi
-            fi
-        done
-        return 1
+        # no ps under debian:latest
+        apt-get -y update && apt-get -y install procps
+        ps aux | grep "$PYTHON_CMD.*$LSP_BRIDGE_SCRIPT" | grep -v grep >/dev/null
     fi
 }
 
@@ -37,9 +31,9 @@ if ! is_process_running; then
         echo "Start lsp-bridge successfully" | tee -a "$LOG_FILE"
     else
         echo "Start lsp-bridge failed" | tee -a "$LOG_FILE"
+        cat "$LOG_FILE"
         exit 1
     fi
 else
     echo "lsp-bridge process is already running" | tee -a "$LOG_FILE"
 fi
-
diff --git a/src/clojure-lsp/devcontainer-feature.json b/src/clojure-lsp/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
   "id": "clojure-lsp",
-  "version": "0.4.9",
+  "version": "0.4.10",
   "name": "emacs lsp-bridge clojure-lsp language server",
   "description": "emacs lsp-bridge clojure-lsp language server environment installed by Nix Pacakge Manager",
   "options": {

diff --git a/src/clojure-lsp/lsp-bridge-start.sh b/src/clojure-lsp/lsp-bridge-start.sh
@@ -11,15 +11,9 @@ is_process_running() {
     elif command -v ps >/dev/null 2>&1; then
         ps aux | grep "$PYTHON_CMD.*$LSP_BRIDGE_SCRIPT" | grep -v grep >/dev/null
     else
-        # Fallback to /proc filesystem
-        for pid in /proc/[0-9]*; do
-            if [ -e "$pid/cmdline" ]; then
-                if grep -q "$PYTHON_CMD.*$LSP_BRIDGE_SCRIPT" "$pid/cmdline"; then
-                    return 0
-                fi
-            fi
-        done
-        return 1
+        # no ps under debian:latest
+        apt-get -y update && apt-get -y install procps
+        ps aux | grep "$PYTHON_CMD.*$LSP_BRIDGE_SCRIPT" | grep -v grep >/dev/null
     fi
 }
 
@@ -37,9 +31,9 @@ if ! is_process_running; then
         echo "Start lsp-bridge successfully" | tee -a "$LOG_FILE"
     else
         echo "Start lsp-bridge failed" | tee -a "$LOG_FILE"
+        cat "$LOG_FILE"
         exit 1
     fi
 else
     echo "lsp-bridge process is already running" | tee -a "$LOG_FILE"
 fi
-
diff --git a/src/cmake-language-server/devcontainer-feature.json b/src/cmake-language-server/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
   "id": "cmake-language-server",
-  "version": "0.4.9",
+  "version": "0.4.10",
   "name": "emacs lsp-bridge cmake-language-server language server",
   "description": "emacs lsp-bridge cmake-language-server language server environment installed by Nix Pacakge Manager",
   "options": {

diff --git a/src/cmake-language-server/lsp-bridge-start.sh b/src/cmake-language-server/lsp-bridge-start.sh
@@ -11,15 +11,9 @@ is_process_running() {
     elif command -v ps >/dev/null 2>&1; then
         ps aux | grep "$PYTHON_CMD.*$LSP_BRIDGE_SCRIPT" | grep -v grep >/dev/null
     else
-        # Fallback to /proc filesystem
-        for pid in /proc/[0-9]*; do
-            if [ -e "$pid/cmdline" ]; then
-                if grep -q "$PYTHON_CMD.*$LSP_BRIDGE_SCRIPT" "$pid/cmdline"; then
-                    return 0
-                fi
-            fi
-        done
-        return 1
+        # no ps under debian:latest
+        apt-get -y update && apt-get -y install procps
+        ps aux | grep "$PYTHON_CMD.*$LSP_BRIDGE_SCRIPT" | grep -v grep >/dev/null
     fi
 }
 
@@ -37,9 +31,9 @@ if ! is_process_running; then
         echo "Start lsp-bridge successfully" | tee -a "$LOG_FILE"
     else
         echo "Start lsp-bridge failed" | tee -a "$LOG_FILE"
+        cat "$LOG_FILE"
         exit 1
     fi
 else
     echo "lsp-bridge process is already running" | tee -a "$LOG_FILE"
 fi
-