Passage local: → var (2)

This commit is contained in:
Benjamin VAUDOUR 2021-08-27 22:06:49 +02:00
parent 81ab7d87ed
commit a49f17bc35
15 changed files with 108 additions and 112 deletions

View file

@ -1,7 +1,7 @@
use moi/util/condition
use moi/util/file
commands = [
var commands = [
help
archive
unarchive
@ -9,12 +9,12 @@ commands = [
ls
]
extensions = [ tar bz2 zip gz lz4 sz xz zst rar ]
var extensions = [ tar bz2 zip gz lz4 sz xz zst rar ]
fn -comp-commands { all $commands }
fn -comp-archive-files [m]{
local:type = (condition:cset (eq $m '') prefix deep-prefix)
var type = (condition:cset (eq $m '') prefix deep-prefix)
file:match-extensions &type=$type $m $@extensions
}
@ -27,8 +27,7 @@ fn -comp-inline-files [archive]{
}
fn complete [@argv]{
local:c = (count $argv)
local:cmd = $argv[1]
var c cmd = (count $argv) $argv[1]
if (== $c 2) {
-comp-commands
} elif (== $c 3) {
@ -39,7 +38,7 @@ fn complete [@argv]{
if (eq $cmd archive) {
edit:complete-filename $@argv
} elif (eq $cmd extract) {
local:archive = $argv[2]
var archive = $argv[2]
-comp-inline-files $archive
}
}

View file

@ -1,11 +1,11 @@
use moi/util/condition
use moi/util/file
extensions = [ tar bz2 zip gz lz4 sz xz zst rar ]
var extensions = [ tar bz2 zip gz lz4 sz xz zst rar ]
fn complete [@argv]{
local:m = $argv[-1]
local:type = (condition:cset (eq $m '') prefix deep-prefix)
var m = $argv[-1]
var type = (condition:cset (eq $m '') prefix deep-prefix)
file:match-extensions &type=$type $m $@extensions
}

View file

@ -1,6 +1,6 @@
fn -remotes-packages { kcp -lN }
options = [
var options = [
-h
-v
-i
@ -21,7 +21,7 @@ options = [
-V
]
np = [
var np = [
-i
-di
-s
@ -30,7 +30,7 @@ np = [
]
fn complete [@argv]{
local:c = (count $argv)
var c = (count $argv)
if (== $c 2) {
all $options
} elif (and (== $c 3) (has-value $np $argv[-2])) {

View file

@ -1,7 +1,7 @@
use moi/util/condition
use moi/util/file
extensions = [
var extensions = [
aac
ape
avi
@ -36,12 +36,12 @@ extensions = [
]
fn -files [m]{
local:type = (condition:cset (eq $m '') prefix deep-prefix)
var type = (condition:cset (eq $m '') prefix deep-prefix)
file:match-extensions &type=$type $m $@extensions
}
fn complete [@argv]{
c = (count $argv)
var c = (count $argv)
if (== $c 2) {
put --speed
-files $argv[-1]

View file

@ -5,12 +5,12 @@ use moi/util/list
fn -local-packages { pacman -Q | eawk [_ p @_]{ put $p } }
fn -repo-packages {
local:packages = [(pacman -Ss | list:ploop &step=2 [_ v]{
var packages = [(pacman -Ss | list:ploop &step=2 [_ v]{
put $v
} | eawk [_ p @_]{
put $p
})]
local:spackages = [&]
var spackages = [&]
use str
peach [p]{
str:split '/' $p
@ -22,13 +22,13 @@ fn -repo-packages {
}
fn -downloaded-packages [m]{
local:type = (condition:cset (eq $m '') prefix deep-prefix)
var type = (condition:cset (eq $m '') prefix deep-prefix)
file:match-extensions &type=$type $m tar.zst tar.xz tar.gz tar.bz2
}
fn -local-file [m]{ edit:complete-filename $m }
options = [
var options = [
-h
-V
-Q
@ -50,13 +50,13 @@ options = [
-D
]
asdeps = [
var asdeps = [
-S
-U
-D
]
lpack = [
var lpack = [
-Q
-Qs
-Ql
@ -66,27 +66,27 @@ lpack = [
-Rsn
]
rpack = [
var rpack = [
-S
-Ss
-Si
-Sii
]
dpack = [
var dpack = [
-U
]
fpack = [
var fpack = [
-Qo
]
fn complete [@argv]{
local:c = (count $argv)
var c = (count $argv)
if (< $c 3) {
all $options
} else {
local:cmd = $argv[1]
var cmd = $argv[1]
if (and (== $c 3) (has-value $asdeps $cmd)) {
put --asdeps --asexplicit
}

View file

@ -7,10 +7,10 @@ use moi/util/list
use moi/util/map
use moi/util/option
options-ssh = [ 1 2 4 6 A D f g I i L l m o v a b C c e F k N n p q R s T t X x ]
options-scp = [ 3 4 6 B C p q r v c F i l o P S ]
var options-ssh = [ 1 2 4 6 A D f g I i L l m o v a b C c e F k N n p q R s T t X x ]
var options-scp = [ 3 4 6 B C p q r v c F i l o P S ]
names = [
var names = [
benjamin
luence
]
@ -19,15 +19,15 @@ fn -kh {
cat ~/.ssh/known_hosts | peach [l]{
put [(str:split ' ' $l)]
} | peach [e]{
local:domains @_ = $@e
var domains @_ = $@e
str:split ',' $domains
}
}
fn -port [cmd @argv]{
local:o = (condition:cset (eq $cmd 'ssh') '-p' '-P')
local:margs = (option:map $argv)
local:p = (map:value-of $margs $o &default=[])
var o = (condition:cset (eq $cmd 'ssh') '-p' '-P')
var margs = (option:map $argv)
var p = (map:value-of $margs $o &default=[])
if (list:empty $p) {
put 22
} else {
@ -53,8 +53,8 @@ fn -complete-remote-dir [port address dir]{
}
fn -complete-args [hosts cmd @argv]{
local:arg = $argv[-1]
local:i = (str:index $arg @)
var arg = $argv[-1]
var i = (str:index $arg @)
if (< $i 0) {
-complete-names
all $hosts
@ -63,15 +63,15 @@ fn -complete-args [hosts cmd @argv]{
}
return
}
local:n local:h = $arg[..$i] $arg[(+ $i 1)..]
var n h = $arg[..$i] $arg[(+ $i 1)..]
if (eq $cmd scp) {
i = (str:index $h :)
if (>= $i 0) {
local:d = $h[(+ $i 1)..]
var d = $h[(+ $i 1)..]
h = $h[..$i]
if (list:includes $h $hosts) {
local:p = (-port $cmd @argv)
local:e = [ (str:split / $d) ]
var p = (-port $cmd @argv)
var e = [ (str:split / $d) ]
if (not-eq $e[-1] '') {
d = (str:join / $e[..-1])
if (eq $d '') {
@ -88,10 +88,10 @@ fn -complete-args [hosts cmd @argv]{
}
fn complete [@argv]{
@hosts = (-kh)
local:cmd = $argv[0]
local:is-ssh = (eq $cmd ssh)
local:po = (condition:cset $is-ssh -p -P)
var @hosts = (-kh)
var cmd = $argv[0]
var is-ssh = (eq $cmd ssh)
var po = (condition:cset $is-ssh -p -P)
if (<= (count $argv) 2) {
all (condition:cset $is-ssh $options-ssh $options-scp)
-complete-args $hosts $@argv

View file

@ -1,5 +1,5 @@
local:libdir = $E:HOME/.config/elvish/lib
local:builtin_modules = [
var libdir = $E:HOME/.config/elvish/lib
var builtin_modules = [
builtin
epm
file