Neovim: Python-Provider, Bessere Statusline und Sonarqube überarbeitet

3 files changed, 21 insertions, 9 deletions

diff --git a/nvim/lua/config/options.lua b/nvim/lua/config/options.lua
index 768be6d..37adc84 100644
--- a/nvim/lua/config/options.lua
+++ b/nvim/lua/config/options.lua
@@ -85,6 +85,7 @@ opt.clipboard = "unnamedplus"
 g.loaded_ruby_provider = 0
 g.loaded_perl_provider = 0
 g.loaded_luarocks_provider = 0
+g.python3_host_prog = os.getenv("HOME") .. "/.local/venv/nvim/bin/python"
 
 -- netrw deaktivieren
 g.loaded_netrw = 1
diff --git a/nvim/lua/config/statusline.lua b/nvim/lua/config/statusline.lua
index 7c61956..63c8ba8 100644
--- a/nvim/lua/config/statusline.lua
+++ b/nvim/lua/config/statusline.lua
@@ -92,7 +92,7 @@ end
 ----------------------------------------------------------------------
 
 local function filename()
-  local name = vim.fn.expand("%:t")
+  local name = vim.fn.expand("%:.")
   if name == "" then
     name = "[No Name]"
   end
diff --git a/nvim/scripts/sonarqube.sh b/nvim/scripts/sonarqube.sh
index 15c042e..ee2148e 100755
--- a/nvim/scripts/sonarqube.sh
+++ b/nvim/scripts/sonarqube.sh
@@ -2,17 +2,28 @@
 
 set -eu
 
+errexit() {
+  echo "$@" >&2
+  exit "${2:-1}"
+}
+
+command -v curl >/dev/null || errexit "curl nicht installiert"
+command -v jq >/dev/null || errexit "jq nicht installiert"
+
 SONAR_CONFIGURATION_FILE="/opt/homebrew/etc/sonar-scanner.properties"
-PROJECT_FILE=$(find . -maxdepth 1 -name "sonar-project*.properties" | head -n 1)
+[ -f "$SONAR_CONFIGURATION_FILE" ] || errexit "Keine globale sonarcube Konfiguration gefunden!"
+
+PROJECT_FILE=$(find . -maxdepth 1 -name "sonar-project*.properties" -print -quit)
+[ -n "$PROJECT_FILE" ] || errexit "Keine sonar-project*.properties Datei gefunden!"
+
+SONAR_TOKEN=$(awk -F= '/^sonar.token=/ {gsub(/^[ \t]+|[ \t]+$/,"",$2); print $2}' "$SONAR_CONFIGURATION_FILE")
+[ -n "$SONAR_TOKEN" ] || errexit "Kein 'sonar.token' in $SONAR_CONFIGURATION_FILE vorhanden"
 
-if [ -z "$PROJECT_FILE" ]; then
-  echo "Keine sonar-project*.properties Datei gefunden!" >&2
-  exit 1
-fi
+SONAR_HOST_URL=$(awk -F= '/^sonar.host.url=/ {gsub(/^[ \t]+|[ \t]+$/,"",$2); print $2}' "$SONAR_CONFIGURATION_FILE")
+[ -n "$SONAR_HOST_URL" ] || errexit "Kein 'sonar.host.url' in $SONAR_CONFIGURATION_FILE vorhanden"
 
-SONAR_TOKEN=$(awk -F= '/^sonar.token=/ {print $2}' "$SONAR_CONFIGURATION_FILE")
-SONAR_HOST_URL=$(awk -F= '/^sonar.host.url=/ {print $2}' "$SONAR_CONFIGURATION_FILE")
-PROJECT_KEY=$(awk -F= '/^sonar.projectKey=/ {print $2}' "$PROJECT_FILE")
+PROJECT_KEY=$(awk -F= '/^sonar.projectKey=/ {gsub(/^[ \t]+|[ \t]+$/,"",$2); print $2}' "$PROJECT_FILE")
+[ -n "$PROJECT_KEY" ] || errexit "Kein 'sonar.projectKey' in $PROJECT_FILE vorhanden"
 
 curl -s \
   -u "$SONAR_TOKEN:" \