Merge pull request #113 from legendu-net/dev

Merge dev into main

Author: dclong

.idx/dev.nix

@@ -11,6 +11,7 @@
     util-linux
     go
     uv
+    dos2unix
   ];
   env = {};
   services.docker.enable = true;

cmd/version.go

@@ -8,7 +8,7 @@ import (
 
 // Update icon.
 func version(cmd *cobra.Command, args []string) {
-	fmt.Println("0.25.0")
+	fmt.Println("0.25.1")
 }
 
 var versionCmd = &cobra.Command{

completion/completion.py

@@ -28,6 +28,7 @@ def gen_completion_script_ldc() -> None:
     print("Generate completion script for ldc...")
     completely = 'docker run --rm -it --user $(id -u):$(id -g) --volume "$PWD:/app" dannyben/completely'
     cmd = f"""{completely} preview > completely.bash \
+        && dos2unix completely.bash \
         && mv completely.bash ../utils/data/bash-it/ldc.completion.bash
         """
     sp.run(cmd, shell=True, check=True)

utils/data/bash-it/custom.completion.bash

@@ -1,2 +1,2 @@
-. ./icon.completion.bash
-. ./ldc.completion.bash
+. ~/.bash_it/completion/icon.completion.bash
+. ~/.bash_it/completion/ldc.completion.bash

utils/data/bash-it/custom.plugins.bash

@@ -10,7 +10,11 @@ function cs() {
         _cs.usage
         return 0
     fi
-    cd "$@" 
+    local dir="$@"
+    if [[ -f "$dir" ]]; then
+      dir="$(dirname "$dir")"
+    fi
+    cd "$dir" 
     ls --color=auto
 }
 

utils/data/bash-it/ldc.completion.bash

@@ -1,47 +1,47 @@
-# ldc completion                                           -*- shell-script -*-
-
-# This bash completions script was generated by
-# completely (https://github.com/dannyben/completely)
-# Modifying it manually is not recommended
-
-_ldc_completions_filter() {
-  local words="$1"
-  local cur=${COMP_WORDS[COMP_CWORD]}
-  local result=()
-
-  if [[ "${cur:0:1}" == "-" ]]; then
-    echo "$words"
-
-  else
-    for word in $words; do
-      [[ "${word:0:1}" != "-" ]] && result+=("$word")
-    done
-
-    echo "${result[*]}"
-
-  fi
-}
-
-_ldc_completions() {
-  local cur=${COMP_WORDS[COMP_CWORD]}
-  local compwords=("${COMP_WORDS[@]:1:$COMP_CWORD-1}")
-  local compline="${compwords[*]}"
-
-  case "$compline" in
-    'dclong/jupyterhub-ds'*)
-      while read -r; do COMPREPLY+=("$REPLY"); done < <(compgen -W "$(_ldc_completions_filter "-d --detach --docker-in-docker --dry-run --extra-port-mappings -h --help -m --mount-home -P --password -p --port -u --user")" -- "$cur")
-      ;;
-
-    'dclong/vscode-server'*)
-      while read -r; do COMPREPLY+=("$REPLY"); done < <(compgen -W "$(_ldc_completions_filter "-d --detach --docker-in-docker --dry-run --extra-port-mappings -h --help -m --mount-home -P --password -p --port -u --user")" -- "$cur")
-      ;;
-
-    *)
-      while read -r; do COMPREPLY+=("$REPLY"); done < <(compgen -W "$(_ldc_completions_filter "dclong/jupyterhub-ds dclong/vscode-server -d --detach --docker-in-docker --dry-run --extra-port-mappings -h --help -m --mount-home -P --password -p --port -u --user")" -- "$cur")
-      ;;
-
-  esac
-} &&
-  complete -F _ldc_completions ldc
-
-# ex: filetype=sh
+# ldc completion                                           -*- shell-script -*-
+
+# This bash completions script was generated by
+# completely (https://github.com/dannyben/completely)
+# Modifying it manually is not recommended
+
+_ldc_completions_filter() {
+  local words="$1"
+  local cur=${COMP_WORDS[COMP_CWORD]}
+  local result=()
+
+  if [[ "${cur:0:1}" == "-" ]]; then
+    echo "$words"
+
+  else
+    for word in $words; do
+      [[ "${word:0:1}" != "-" ]] && result+=("$word")
+    done
+
+    echo "${result[*]}"
+
+  fi
+}
+
+_ldc_completions() {
+  local cur=${COMP_WORDS[COMP_CWORD]}
+  local compwords=("${COMP_WORDS[@]:1:$COMP_CWORD-1}")
+  local compline="${compwords[*]}"
+
+  case "$compline" in
+    'dclong/jupyterhub-ds'*)
+      while read -r; do COMPREPLY+=("$REPLY"); done < <(compgen -W "$(_ldc_completions_filter "-d --detach --docker-in-docker --dry-run --extra-port-mappings -h --help -m --mount-home -P --password -p --port -u --user")" -- "$cur")
+      ;;
+
+    'dclong/vscode-server'*)
+      while read -r; do COMPREPLY+=("$REPLY"); done < <(compgen -W "$(_ldc_completions_filter "-d --detach --docker-in-docker --dry-run --extra-port-mappings -h --help -m --mount-home -P --password -p --port -u --user")" -- "$cur")
+      ;;
+
+    *)
+      while read -r; do COMPREPLY+=("$REPLY"); done < <(compgen -W "$(_ldc_completions_filter "dclong/jupyterhub-ds dclong/vscode-server -d --detach --docker-in-docker --dry-run --extra-port-mappings -h --help -m --mount-home -P --password -p --port -u --user")" -- "$cur")
+      ;;
+
+  esac
+} &&
+  complete -F _ldc_completions ldc
+
+# ex: filetype=sh