geoffrey/dotfiles
geoffrey/dotfiles
1
0
Fork 0
Code Issues 8 Pull requests Releases Activity

Merge branch 'master' of https://git.frogeye.fr/geoffrey/dotfiles

Browse source
This commit is contained in:
Geoffrey Frogeye 2019-04-22 21:58:09 +02:00
parent 05079e9068 bda0ee2263
commit 05613c5289
7 changed files with 162 additions and 2016 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
config/shell/commonrc
View file

@ -21,8 +21,8 @@ alias free='free -m'
alias dmesg='dmesg --ctime' alias dmesg='dmesg --ctime'
# [ -f ~/.local/bin/colorSchemeApplyFzf ] && . ~/.local/bin/colorSchemeApplyFzf # Only applies RGB colors... # [ -f ~/.local/bin/colorSchemeApplyFzf ] && . ~/.local/bin/colorSchemeApplyFzf # Only applies RGB colors...
POWERLINE_GO_DEFAULT_OPTS=(-colorize-hostname -max-width 25 -cwd-max-dir-size 10 -modules 'user,host,ssh,venv,cwd,perms,git' -modules-right 'jobs,exit,duration,load') # For reading by shell profiles POWERLINE_GO_DEFAULT_OPTS=(-colorize-hostname -max-width 25 -cwd-max-dir-size 10 -modules 'user,host,venv,cwd,perms,git' -modules-right 'jobs,exit,duration,load') # For reading by shell profiles
FZF_DEFAULT_OPTS="--height 100% --layout=default" FZF_DEFAULT_OPTS="--height 40% --layout=default"
FZF_CTRL_T_OPTS="--preview '[[ -d {} ]] && ls -l --color=always {} || [[ \$(file --mime {}) =~ binary ]] && file --brief {} || (highlight -O ansi -l {} || coderay {} || rougify {} || cat {}) 2> /dev/null | head -500'" FZF_CTRL_T_OPTS="--preview '[[ -d {} ]] && ls -l --color=always {} || [[ \$(file --mime {}) =~ binary ]] && file --brief {} || (highlight -O ansi -l {} || coderay {} || rougify {} || cat {}) 2> /dev/null | head -500'"
FZF_COMPLETION_OPTS="${FZF_CTRL_T_OPTS}" FZF_COMPLETION_OPTS="${FZF_CTRL_T_OPTS}"

2
config/shell/shenv
View file

@ -8,7 +8,7 @@
export PAGER=less export PAGER=less
export EDITOR=nvim export EDITOR=nvim
export VISUAL=nvim export VISUAL=nvim
export BROWSER=qutebrowser export BROWSER=firefox
# Program-specific # Program-specific

26
config/shell/zshrc
View file

@ -15,11 +15,24 @@ ADOTDIR=~/.cache/antigen
mkdir -p $ADOTDIR mkdir -p $ADOTDIR
typeset -a ANTIGEN_CHECK_FILES=(~/.config/shell/zshrc) typeset -a ANTIGEN_CHECK_FILES=(~/.config/shell/zshrc)
source ~/.local/share/zsh/antigen.zsh # Don't work with trysource, why? [ -f ~/.local/share/zsh/antigen.zsh ] || (mkdir -p ~/.local/share/zsh/ && curl -L git.io/antigen > ~/.local/share/zsh/antigen.zsh)
antigen bundle zsh-users/zsh-completions source ~/.local/share/zsh/antigen.zsh
antigen bundle zsh-users/zsh-syntax-highlighting
antigen bundle zsh-users/zsh-autosuggestions # This is better to have them installed as system since we can use them as root
antigen bundle zsh-users/zsh-history-substring-search # pacman -S zsh-autosuggestions zsh-history-substring-search zsh-syntax-highlighting zsh-completions --needed
function plugin() {
if [ -d "/usr/share/licenses/$2" ]
then
trysource "/usr/share/zsh/plugins/$2/$2.zsh"
# It's ok if it fails
else
antigen bundle "$1/$2"
fi
}
plugin zsh-users zsh-completions
plugin zsh-users zsh-syntax-highlighting
plugin zsh-users zsh-autosuggestions
plugin zsh-users zsh-history-substring-search
antigen apply antigen apply
@ -111,8 +124,7 @@ bindkey -M vicmd 'k' history-substring-search-up
bindkey -M vicmd 'j' history-substring-search-down bindkey -M vicmd 'j' history-substring-search-down
# Autocompletion # Autocompletion
autoload -Uz compinit promptinit autoload -Uz promptinit
compinit
promptinit promptinit
# Color common prefix # Color common prefix

1
gitignore
View file

@ -1,3 +1,4 @@
*.swp *.swp
*.swo *.swo
*.ycm_extra_conf.py *.ycm_extra_conf.py
tags

14
scripts/dummy Executable file
View file

@ -0,0 +1,14 @@
#!/usr/bin/bash
# Remplace le contenu d'un dossier par un fichier texte
# relatant son arborescense
dir="$(echo "$1" | sed 's|/\+||')"
if [ -d "$dir" ]; then
TEMP=$(mktemp)
tree -a -p -D -n "$dir" > "$TEMP"
mv "$dir" "$dir.bkp"
mv "$TEMP" "$dir"
else
echo "$dir n'est pas un dossier"
fi

212
scripts/machines
View file

@ -7,14 +7,15 @@ MACHINES_HOME=$HOME
MACHINES_CONFIG=$HOME/.config/machines MACHINES_CONFIG=$HOME/.config/machines
MACHINES_API=https://machines.frogeye.fr MACHINES_API=https://machines.frogeye.fr
mkdir -p $MACHINES_HOME &> /dev/null mkdir -p "$MACHINES_HOME" &> /dev/null
mkdir -p $MACHINES_CONFIG &> /dev/null mkdir -p "$MACHINES_CONFIG" &> /dev/null
# COMMON # COMMON
function prompt { # text function prompt { # text
while true; do while true
read -p "$1 [yn] " yn do
read -r -p "$1 [yn] " yn
case $yn in case $yn in
[Yy]* ) return 1;; [Yy]* ) return 1;;
[Nn]* ) return 0;; [Nn]* ) return 0;;
@ -32,7 +33,7 @@ urlencode() { # string
for (( i = 0; i < length; i++ )); do for (( i = 0; i < length; i++ )); do
local c="${1:i:1}" local c="${1:i:1}"
case $c in case $c in
[a-zA-Z0-9.~_-]) printf "$c" ;; [a-zA-Z0-9.~_-]) printf "%s" "$c" ;;
*) printf '%%%02X' "'$c" ;; *) printf '%%%02X' "'$c" ;;
esac esac
done done
@ -49,7 +50,7 @@ urldecode() { # string
function _machines-api { function _machines-api {
route=$1 route=$1
shift shift
wget $MACHINES_API/$route --content-on-error --quiet --output-document=- "$@" wget "$MACHINES_API/$route" --content-on-error --quiet --output-document=- "$@"
result=$? result=$?
if [ $result != 0 ]; then if [ $result != 0 ]; then
echo "[ERROR] wget returned $result for route $route" 1>&2; echo "[ERROR] wget returned $result for route $route" 1>&2;
@ -58,53 +59,53 @@ function _machines-api {
} }
function _machines-apiToken { function _machines-apiToken {
read -p 'TOTP token: ' token read -r -p 'TOTP token: ' token
_machines-api "$@" --header="X-TOTP: $token" _machines-api "$@" --header="X-TOTP: $token"
} }
function _machines-apiSigned { function _machines-apiSigned {
_machines-ensureAdmin _machines-ensureAdmin
_machines-api "$@" --certificate=$MACHINES_CONFIG/machines.crt --private-key=$MACHINES_CONFIG/machines.key _machines-api "$@" --certificate="$MACHINES_CONFIG/machines.crt" --private-key="$MACHINES_CONFIG/machines.key"
} }
# APPLICATION KEYS & CERTIFICATE # APPLICATION KEYS & CERTIFICATE
function _machines-pubFromCrt { function _machines-pubFromCrt {
openssl x509 -in $MACHINES_CONFIG/machines.crt -pubkey -noout > $MACHINES_CONFIG/machines.pub openssl x509 -in "$MACHINES_CONFIG/machines.crt" -pubkey -noout > "$MACHINES_CONFIG/machines.pub"
} }
function _machines-verifyCertificate { function _machines-verifyCertificate {
return return
if openssl verify $MACHINES_CONFIG/machines.crt | grep -v 'error 18' | grep 'error' --quiet; then if openssl verify "$MACHINES_CONFIG/machines.crt" | grep -v 'error 18' | grep 'error' --quiet; then
echo "[ERROR] Invalid certificate" 1>&2; echo "[ERROR] Invalid certificate" 1>&2;
exit 1 exit 1
fi fi
} }
function _machines-ensurePub { function _machines-ensurePub {
if [ ! -f $MACHINES_CONFIG/machines.crt ]; then if [ ! -f "$MACHINES_CONFIG/machines.crt" ]; then
CERT_FILE=$(mktemp) CERT_FILE=$(mktemp)
echo "[INFO] Downloading certificate..." echo "[INFO] Downloading certificate..."
_machines-api cert > $CERT_FILE _machines-api cert > "$CERT_FILE"
openssl x509 -fingerprint -in $CERT_FILE | grep Fingerprint --color=never openssl x509 -fingerprint -in "$CERT_FILE" | grep Fingerprint --color=never
prompt "Is this correct ?" prompt "Is this correct ?"
if [ $? == 1 ]; then if [ $? == 1 ]; then
mv $CERT_FILE $MACHINES_CONFIG/machines.crt &> /dev/null mv "$CERT_FILE" "$MACHINES_CONFIG/machines.crt" &> /dev/null
else else
echo "[ERROR] Certificate rejected." 1>&2; echo "[ERROR] Certificate rejected." 1>&2;
exit 1 exit 1
fi fi
fi fi
_machines-verifyCertificate _machines-verifyCertificate
if [ ! -f $MACHINES_CONFIG/machines.pub ]; then if [ ! -f "$MACHINES_CONFIG/machines.pub" ]; then
_machines-pubFromCrt _machines-pubFromCrt
fi fi
return 0 return 0
} }
function _machines-ensureAdmin { function _machines-ensureAdmin {
if [ ! -f $MACHINES_CONFIG/machines.key ]; then if [ ! -f "$MACHINES_CONFIG/machines.key" ]; then
echo "[ERROR] You need have to have the private key to do that" 1>&2; echo "[ERROR] You need have to have the private key to do that" 1>&2;
exit 1 exit 1
fi fi
@ -115,52 +116,52 @@ function _machines-ensureAdmin {
function _machines-signAkey { # network function _machines-signAkey { # network
KEY_FILE=$(mktemp) KEY_FILE=$(mktemp)
SIGN_FILE=$(mktemp) SIGN_FILE=$(mktemp)
_machines-apiSigned akey/$1?unsigned > $KEY_FILE _machines-apiSigned "akey/$1?unsigned" > "$KEY_FILE"
openssl dgst -sha256 -sign $MACHINES_CONFIG/machines.key -out $SIGN_FILE $KEY_FILE openssl dgst -sha256 -sign "$MACHINES_CONFIG/machines.key" -out "$SIGN_FILE" "$KEY_FILE"
_machines-apiSigned akey/$1 --method=PUT --body-file=$SIGN_FILE _machines-apiSigned "akey/$1" --method=PUT --body-file="$SIGN_FILE"
rm $KEY_FILE $SIGN_FILE &> /dev/null rm "$KEY_FILE" "$SIGN_FILE" &> /dev/null
} }
function _machines-getAkey { # network function _machines-getAkey { # network
_machines-ensurePub _machines-ensurePub
KEY_FILE=$(mktemp) KEY_FILE=$(mktemp)
SIGN_FILE=$(mktemp) SIGN_FILE=$(mktemp)
_machines-api akey/$1 > $KEY_FILE _machines-api "akey/$1" > "$KEY_FILE"
_machines-api akey/$1?signature > $SIGN_FILE _machines-api "akey/$1?signature" > "$SIGN_FILE"
md5sum $KEY_FILE &1>&2; md5sum "$KEY_FILE" 1>&2;
md5sum $SIGN_FILE &1>&2; md5sum "$SIGN_FILE" 1>&2;
md5sum $MACHINES_CONFIG/machines.pub &1>&2; md5sum "$MACHINES_CONFIG/machines.pub" 1>&2;
openssl dgst -sha256 -verify $MACHINES_CONFIG/machines.pub -signature $SIGN_FILE $KEY_FILE &> /dev/null if openssl dgst -sha256 -verify "$MACHINES_CONFIG/machines.pub" -signature "$SIGN_FILE" "$KEY_FILE" &> /dev/null
if [ $? == 0 ]; then then
cat $KEY_FILE cat "$KEY_FILE"
rm $KEY_FILE $SIGN_FILE &> /dev/null \rm "$KEY_FILE" "$SIGN_FILE"
return 0 return 0
else else
rm $KEY_FILE $SIGN_FILE &> /dev/null \rm "$KEY_FILE" "$SIGN_FILE"
exit 1 exit 1
fi fi
} }
function _machines-updateAkey { function _machines-updateAkey {
MYKEY_FILE=$(mktemp) MYKEY_FILE=$(mktemp)
network=$(cat $MACHINES_CONFIG/this | grep '^network=' | cut -d '=' -f 2) network=$(grep '^network=' "$MACHINES_CONFIG/this" | cut -d '=' -f 2)
_machines-getAkey $network > "$MYKEY_FILE" if _machines-getAkey "$network" > "$MYKEY_FILE"
if [ $? == 0 ]; then then
yes | mv $MYKEY_FILE $MACHINES_HOME/.ssh/authorized_keys &> /dev/null \mv -f "$MYKEY_FILE" "$MACHINES_HOME/.ssh/authorized_keys"
return 0 return 0
else else
cat $MYKEY_FILE cat "$MYKEY_FILE"
echo "[ERROR] Authorized keys are not properly signed" 1>&2; echo "[ERROR] Authorized keys are not properly signed" 1>&2;
rm $MYKEY_FILE \rm "$MYKEY_FILE"
exit 1 exit 1
fi fi
} }
function _machines-postFile { # filename function _machines-postFile { # filename
cat $1 | while read line; do cat $1 | while read -r line; do
parameter=$(echo $line | cut -d '=' -f 1) parameter=$(echo "$line" | cut -d '=' -f 1)
value="$(echo $line | sed 's/^[a-zA-Z0-9]\+\(\[\]\)\?=//')" value="$(echo "$line" | sed 's/^[a-zA-Z0-9]\+\(\[\]\)\?=//')"
echo -n "&$parameter=$(urlencode "$value")" echo -n "&$parameter=$(urlencode "$value")"
done done
} }
@ -168,44 +169,47 @@ function _machines-postFile { # filename
function _machines-addElement { # element elementType default function _machines-addElement { # element elementType default
FILE=$(mktemp) FILE=$(mktemp)
echo -e $3 > $FILE echo -e "$3" > "$FILE"
$EDITOR $FILE $EDITOR "$FILE"
data=$(_machines-postFile $FILE) data=$(_machines-postFile "$FILE")
rm $FILE &> /dev/null \rm "$FILE"
_machines-apiSigned $2 --post-data "name=$1$data" _machines-apiSigned "$2" --post-data "name=$1$data"
}
function _machines-viewElement { # element elementType
_machines-apiSigned "$2/$1"
} }
function _machines-editElement { # element elementType function _machines-editElement { # element elementType
FILE=$(mktemp) FILE=$(mktemp)
_machines-apiSigned $2/$1 > $FILE _machines-apiSigned "$2/$1" > "$FILE"
$EDITOR $FILE $EDITOR "$FILE"
data=$(_machines-postFile $FILE) data=$(_machines-postFile "$FILE")
rm $FILE &> /dev/null rm "$FILE" &> /dev/null
err=$(_machines-apiSigned $2/$1 --post-data "$data") err=$(_machines-apiSigned "$2/$1" --post-data "$data")
} }
function _machines-deleteElement { # element elementType function _machines-deleteElement { # element elementType
err=$(_machines-apiSigned $2/$1 --method=DELETE) err=$(_machines-apiSigned "$2/$1" --method=DELETE)
} }
# USER ADMIN FUNCTIONS # USER ADMIN FUNCTIONS
function machines_history { function machines_history {
if [ -f $MACHINES_CONFIG/lastVerifiedLog ]; then if [ -f "$MACHINES_CONFIG/lastVerifiedLog" ]; then
from=$(<"$MACHINES_CONFIG/lastVerifiedLog") from=$(<"$MACHINES_CONFIG/lastVerifiedLog")
else else
from=0 from=0
fi fi
d=$(date +%s) d=$(date +%s)
_machines-apiSigned log?from=$from | less _machines-apiSigned log?from=$from | less
prompt "Is this OK?" if prompt "Is this OK?"
if [ $? == 1 ]; then then
echo $d > $MACHINES_CONFIG/lastVerifiedLog
return 0
else
echo "Houston, we have a problem..."
exit 1 exit 1
else
echo "$d" > "$MACHINES_CONFIG/lastVerifiedLog"
return 0
fi fi
} }
@ -213,7 +217,7 @@ function machines_sign {
machines_history machines_history
echo "Signing default network authorized_keys..." echo "Signing default network authorized_keys..."
_machines-signAkey _machines-signAkey
_machines-apiSigned network | while read network; do _machines-apiSigned network | while read -r network; do
echo "Signing network $network authorized_keys..." echo "Signing network $network authorized_keys..."
_machines-signAkey $network _machines-signAkey $network
done done
@ -235,11 +239,11 @@ function machines_machine_add_help {
return 0 return 0
} }
function machines_machine_add { # machine function machines_machine_add { # machine
if [ -z $1 ]; then if [ -z "$1" ]; then
machines_machine_add_help machines_machine_add_help
exit 1 exit 1
fi fi
_machines-addElement $1 machine "host[]=\nnetwork=\nuserkey=\nhostkey=\nuser=" _machines-addElement "$1" machine "host[]=\nnetwork=\nuserkey=\nhostkey=\nuser="
} }
function machines_network_add_help { function machines_network_add_help {
@ -249,42 +253,75 @@ function machines_network_add_help {
echo " NETWORK Network to add" echo " NETWORK Network to add"
return 0 return 0
} }
function machines_network_add { # network function machines_network_add { # network
if [ -z $1 ]; then if [ -z "$1" ]; then
machines_network_add_help machines_network_add_help
exit 1 exit 1
fi fi
_machines-addElement $1 network "allowed[]=\nsecure=false" _machines-addElement "$1" network "allowed[]=\nsecure=false"
}
function machines_machine_view_help {
echo "Usage: $0 machine|mac|m view MACHINE"
echo
echo "Arguments:"
echo " MACHINE machine to view"
return 0
}
function machines_machine_view { # machine
if [ -z "$1" ]; then
machines_machine_view_help
exit 1
fi
_machines-viewElement "$1" machine
}
function machines_network_view_help {
echo "Usage: $0 network|net|n view NETWORK"
echo
echo "Arguments:"
echo " NETWORK Network to view"
return 0
}
function machines_network_view { # network
if [ -z "$1" ]; then
machines_network_view_help
exit 1
fi
_machines-viewElement "$1" network
} }
function machines_machine_edit_help { function machines_machine_edit_help {
echo "Usage: $0 machine|mac|m edit MACHINE" echo "Usage: $0 machine|mac|m edit MACHINE"
echo echo
echo "Arguments:" echo "Arguments:"
echo " MACHINE machine to remove" echo " MACHINE machine to edit"
return 0 return 0
} }
function machines_machine_edit { # machine function machines_machine_edit { # machine
if [ -z $1 ]; then if [ -z "$1" ]; then
machines_machine_edit_help machines_machine_edit_help
exit 1 exit 1
fi fi
_machines-editElement $1 machine _machines-editElement "$1" machine
} }
function machines_network_edit_help { function machines_network_edit_help {
echo "Usage: $0 network|net|n edit NETWORK" echo "Usage: $0 network|net|n edit NETWORK"
echo echo
echo "Arguments:" echo "Arguments:"
echo " NETWORK Network to remove" echo " NETWORK Network to edit"
return 0 return 0
} }
function machines_network_edit { # network function machines_network_edit { # network
if [ -z $1 ]; then if [ -z "$1" ]; then
machines_network_edit_help machines_network_edit_help
exit 1 exit 1
fi fi
_machines-editElement $1 network _machines-editElement "$1" network
} }
function machines_machine_delete_help { function machines_machine_delete_help {
@ -295,11 +332,11 @@ function machines_machine_delete_help {
return 0 return 0
} }
function machines_machine_delete { # machine function machines_machine_delete { # machine
if [ -z $1 ]; then if [ -z "$1" ]; then
machines_machine_delete_help machines_machine_delete_help
exit 1 exit 1
fi fi
_machines-deleteElement $1 machine _machines-deleteElement "$1" machine
} }
function machines_network_delete_help { function machines_network_delete_help {
@ -310,11 +347,11 @@ function machines_network_delete_help {
return 0 return 0
} }
function machines_network_delete { # network function machines_network_delete { # network
if [ -z $1 ]; then if [ -z "$1" ]; then
machines_network_delete_help machines_network_delete_help
exit 1 exit 1
fi fi
_machines-deleteElement $1 network _machines-deleteElement "$1" network
} }
function machines_machine_help { function machines_machine_help {
@ -323,6 +360,7 @@ function machines_machine_help {
echo "Commands:" echo "Commands:"
echo " list List all machines" echo " list List all machines"
echo " add Interactively add a machine" echo " add Interactively add a machine"
echo " view Display a machine"
echo " edit Interactively edit a specified machine" echo " edit Interactively edit a specified machine"
echo " delete Remove a specified machine" echo " delete Remove a specified machine"
echo " help Get help with commands" echo " help Get help with commands"
@ -344,6 +382,7 @@ function machines_network_help {
echo "Commands:" echo "Commands:"
echo " list List all networks" echo " list List all networks"
echo " add Interactively add a network" echo " add Interactively add a network"
echo " view Display a network"
echo " edit Interactively edit a specified network" echo " edit Interactively edit a specified network"
echo " delete Remove a specified network" echo " delete Remove a specified network"
echo " help Get help with commands" echo " help Get help with commands"
@ -369,10 +408,9 @@ machines_net_help() { machines_network_help "$@"; }
machines_n_help() { machines_network_help "$@"; } machines_n_help() { machines_network_help "$@"; }
function machines_update-all { function machines_update-all {
machines_machine_list | while read machine; do machines_machine_list | while read -r machine; do
echo "Updating $machine..." echo "Updating $machine..."
ssh $machine 'machines update' & ssh "$machine" 'cd .dotfiles && git pull; machines update' &
ssh $machine 'cd .dotfiles && git pull' &
done done
} }
@ -381,10 +419,10 @@ function machines_regen-keys {
echo "[ERROR] Please delete the pem files manually to prove you know what you're doing." 1>&2; echo "[ERROR] Please delete the pem files manually to prove you know what you're doing." 1>&2;
exit 1 exit 1
else else
openssl genrsa -out $MACHINES_CONFIG/machines.key 4096 openssl genrsa -out "$MACHINES_CONFIG/machines.key" 4096
chmod 600 $MACHINES_CONFIG/machines.key chmod 600 "$MACHINES_CONFIG/machines.key"
openssl req -key $MACHINES_CONFIG/machines.key -new -out $MACHINES_CONFIG/machines.csr openssl req -key "$MACHINES_CONFIG/machines.key" -new -out "$MACHINES_CONFIG/machines.csr"
openssl x509 -req -days 1826 -in $MACHINES_CONFIG/machines.csr -signkey $MACHINES_CONFIG/machines.key -out $MACHINES_CONFIG/machines.crt openssl x509 -req -days 1826 -in "$MACHINES_CONFIG/machines.csr" -signkey "$MACHINES_CONFIG/machines.key" -out "$MACHINES_CONFIG/machines.crt"
_machines-pubFromCrt _machines-pubFromCrt
fi fi
} }
@ -393,7 +431,7 @@ function machines_regen-keys {
# USER FUNCTIONS # USER FUNCTIONS
function machines_setup { function machines_setup {
if [ -e $MACHINES_CONFIG/this.name ]; then if [ -e "$MACHINES_CONFIG/this.name" ]; then
echo "[ERROR] This machine is already set up" 1>&2; echo "[ERROR] This machine is already set up" 1>&2;
exit 1 exit 1
fi fi
@ -401,13 +439,13 @@ function machines_setup {
_machines-ensurePub _machines-ensurePub
# Variables # Variables
read -p 'Machine name? ' name read -r -p 'Machine name? ' name
read -p 'Hosts (separated by spaces)? ' hosts read -r -p 'Hosts (separated by spaces)? ' hosts
# User key # User key
mkdir -p $MACHINES_HOME/.ssh &> /dev/null mkdir -p "$MACHINES_HOME/.ssh" &> /dev/null
if [[ ! -f $MACHINES_HOME/.ssh/id_rsa || ! -f $MACHINES_HOME/.ssh/id_rsa.pub ]]; then if [[ ! -f $MACHINES_HOME/.ssh/id_rsa || ! -f $MACHINES_HOME/.ssh/id_rsa.pub ]]; then
ssh-keygen -b 4096 -C "$name@machines.frogeye.fr" -f $MACHINES_HOME/.ssh/id_rsa -t rsa ssh-keygen -b 4096 -C "$name@machines.frogeye.fr" -f "$MACHINES_HOME/.ssh/id_rsa" -t rsa
fi fi
userkey=$(<"$MACHINES_HOME/.ssh/id_rsa.pub") userkey=$(<"$MACHINES_HOME/.ssh/id_rsa.pub")
@ -427,12 +465,12 @@ function machines_setup {
_machines-apiToken machine --post-data "$data" _machines-apiToken machine --post-data "$data"
echo $name > $MACHINES_CONFIG/this.name echo "$name" > "$MACHINES_CONFIG/this.name"
machines_update machines_update
} }
function machines_update { function machines_update {
_machines-api machine/$(cat $MACHINES_CONFIG/this.name) > $MACHINES_CONFIG/this _machines-api "machine/$(cat "$MACHINES_CONFIG/this.name")" > "$MACHINES_CONFIG/this"
_machines-updateAkey _machines-updateAkey
} }
@ -475,5 +513,5 @@ shift
if type "machines_$command" &> /dev/null; then if type "machines_$command" &> /dev/null; then
"machines_$command" "$@" "machines_$command" "$@"
else else
machines_help machines_help "$@"
fi fi

1919
tags
View file

File diff suppressed because it is too large Load diff