diff options
| -rw-r--r-- | config/dodo/config.py | 4 | ||||
| -rwxr-xr-x | config/i3/scripts/keyboard_switch | 14 | ||||
| -rwxr-xr-x | config/i3/scripts/pass | 6 | ||||
| -rw-r--r-- | config/nvim/init.vim | 7 | ||||
| -rw-r--r-- | config/nvim/lua/plugins.lua | 6 | ||||
| -rw-r--r-- | config/sway/bindsym-media | 4 | ||||
| -rw-r--r-- | config/sway/bindsym-system | 8 | ||||
| -rw-r--r-- | config/sway/daemons | 2 | ||||
| -rwxr-xr-x | config/sway/scripts/pass | 6 | ||||
| -rwxr-xr-x | config/sway/scripts/screenshot | 19 | ||||
| -rw-r--r-- | config/systemd/user/davmail.service | 5 | ||||
| -rw-r--r-- | config/systemd/user/waybar.service | 8 | ||||
| -rwxr-xr-x | config/waybar/email.sh | 2 | ||||
| -rwxr-xr-x | install | 17 | ||||
| -rwxr-xr-x | local/bin/allsync | 63 | ||||
| -rwxr-xr-x | local/bin/cloud | 15 | ||||
| -rwxr-xr-x | local/bin/elektroline00 | 1 | ||||
| -rwxr-xr-x | local/bin/new-flake-dev | 7 | ||||
| -rwxr-xr-x | local/bin/project-test | 30 | ||||
| -rwxr-xr-x | local/bin/startsway | 7 | ||||
| m--------- | private | 0 | ||||
| -rw-r--r-- | shvcli.ini | 7 | ||||
| -rw-r--r-- | shvcli.toml | 4 | ||||
| -rw-r--r-- | utils/ask | 24 | ||||
| -rw-r--r-- | utils/guix | 16 | ||||
| -rw-r--r-- | utils/inst | 53 |
26 files changed, 198 insertions, 137 deletions
diff --git a/config/dodo/config.py b/config/dodo/config.py index 66e64ac..1347424 100644 --- a/config/dodo/config.py +++ b/config/dodo/config.py @@ -1,14 +1,16 @@ import dodo -dodo.settings.smtp_accounts = ["email", "gmail", "fel"] +dodo.settings.smtp_accounts = ["email", "gmail", "ell", "fel"] dodo.settings.email_address = { "email": "Karel Kočí <cynerd@email.cz>", "gmail": "Karel Kočí <citrisin@gmail.com>", + "ell": "Karel Kočí <kkoci@elektroline.cz>", "fel": "Karel Kočí <kocikare@fel.cvut.cz>", } dodo.settings.sent_dir = { "email": "~/.mail/email/sent/", "gmail": "~/.mail/gmail/Drafts/", + "ell": "~/.mail/ell/Sent/", "fel": "~/.mail/fel/Sent/", } dodo.settings.gnupg_keyid = "2B1F70F95F1B48DA2265A7FAA6BC8B8CEB31659B" diff --git a/config/i3/scripts/keyboard_switch b/config/i3/scripts/keyboard_switch index 7ba27f8..168d577 100755 --- a/config/i3/scripts/keyboard_switch +++ b/config/i3/scripts/keyboard_switch @@ -1,13 +1,13 @@ #!/bin/bash -active=`~/.config/i3/scripts/keyboard_layout` +active=$(~/.config/i3/scripts/keyboard_layout) case "$active" in - us) - setxkbmap cz_qwerty - ;; - cz_qwerty) - setxkbmap us - ;; +us) + setxkbmap cz_qwerty + ;; +cz_qwerty) + setxkbmap us + ;; esac # Send update to i3blocks diff --git a/config/i3/scripts/pass b/config/i3/scripts/pass index aa2ad96..4777c1c 100755 --- a/config/i3/scripts/pass +++ b/config/i3/scripts/pass @@ -1,6 +1,6 @@ #!/bin/sh -find ~/.password-store -type f -printf '%P\n' | \ - sed 's/\.gpg$//' | dmenu -p 'Pass:' | \ +find ~/.password-store -type f -printf '%P\n' | + sed 's/\.gpg$//' | dmenu -p 'Pass:' | while read -r psw; do pass -c "$psw" -done + done diff --git a/config/nvim/init.vim b/config/nvim/init.vim index 3165498..c269b77 100644 --- a/config/nvim/init.vim +++ b/config/nvim/init.vim @@ -99,6 +99,9 @@ nnoremap <c-c><CR> :Explore<cr> nnoremap <c-c>l :bnext<cr> nnoremap <c-c>h :bprev<cr> +" Table mode +let g:table_mode_syntax = 0 + " Format nmap <leader>f :lua require("conform").format()<cr> @@ -108,10 +111,6 @@ highlight GitGutterAdd ctermfg=2 highlight GitGutterChange ctermfg=3 highlight GitGutterDelete ctermfg=1 -" Setup table-mode to markdown compliant -" Note: to start use "\ t m" -let g:table_mode_corner='|' - " Spell checking map <F10> :setlocal spell!<cr> function LangToggle() diff --git a/config/nvim/lua/plugins.lua b/config/nvim/lua/plugins.lua index a1c17bf..d1a4c55 100644 --- a/config/nvim/lua/plugins.lua +++ b/config/nvim/lua/plugins.lua @@ -127,9 +127,9 @@ require("packer").startup(function(use) -- Additional integrations ------------------------------------------------- use({ "chomosuke/typst-preview.nvim", - tag = "v0.1.*", - run = function() - require("typst-preview").update() + tag = "v1.*", + config = function() + require("typst-preview").setup({}) end, }) -- Movement, format and others --------------------------------------------- diff --git a/config/sway/bindsym-media b/config/sway/bindsym-media index 13026fc..b1159ef 100644 --- a/config/sway/bindsym-media +++ b/config/sway/bindsym-media @@ -12,8 +12,8 @@ for_window [ title="Pulsemixer" ] move position center # Screen brightness controls -bindsym XF86MonBrightnessUp exec --no-startup-id light -A 10 -bindsym XF86MonBrightnessDown exec --no-startup-id light -U 10 +bindsym XF86MonBrightnessUp exec --no-startup-id brightnessctl set +10% +bindsym XF86MonBrightnessDown exec --no-startup-id brightnessctl set 10%- # Media player controls bindsym XF86AudioPlay exec --no-startup-id mpc toggle && pkill -RTMIN+12 i3blocks diff --git a/config/sway/bindsym-system b/config/sway/bindsym-system index 7afcb4c..79094be 100644 --- a/config/sway/bindsym-system +++ b/config/sway/bindsym-system @@ -13,10 +13,12 @@ mode "$mode_system" { bindsym $mod+Shift+q mode "$mode_system" -set $screenshot Screenshot: (s)elect or (d)desktop +set $screenshot Screenshot: (s)elect or (w)indow or (o)tput or (d)desktop mode "$screenshot" { - bindsym --release d exec --no-startup-id grim, mode "default" - bindsym --release s exec --no-startup-id sh -c "slurp | grim -g -", mode "default" + bindsym --locked s exec --no-startup-id ~/.config/sway/scripts/screenshot select, mode "default" + bindsym --locked w exec --no-startup-id ~/.config/sway/scripts/screenshot window, mode "default" + bindsym --locked o exec --no-startup-id ~/.config/sway/scripts/screenshot output, mode "default" + bindsym --locked d exec --no-startup-id ~/.config/sway/scripts/screenshot desktop, mode "default" bindsym Return mode "default" bindsym Escape mode "default" diff --git a/config/sway/daemons b/config/sway/daemons index 786fa70..a6579da 100644 --- a/config/sway/daemons +++ b/config/sway/daemons @@ -2,8 +2,10 @@ exec --no-startup-id { kanshi swayidle + waybar dunst } for_window [class="Ferdi"] move scratchpad exec ferdium +exec sh -c 'if commad -v openrgb >/dev/null; then exec openrgb --startminimized; fi' diff --git a/config/sway/scripts/pass b/config/sway/scripts/pass index 06383b3..11700e6 100755 --- a/config/sway/scripts/pass +++ b/config/sway/scripts/pass @@ -1,6 +1,6 @@ #!/bin/sh -find ~/.password-store -name .git -prune -o -type f -printf '%P\n' | \ - sed 's/\.gpg$//' | wofi -d -p 'Pass:' | \ +find ~/.password-store -name .git -prune -o -type f -printf '%P\n' | + sed 's/\.gpg$//' | wofi -d -p 'Pass:' | while read -r psw; do pass -c "$psw" -done + done diff --git a/config/sway/scripts/screenshot b/config/sway/scripts/screenshot new file mode 100755 index 0000000..45086f1 --- /dev/null +++ b/config/sway/scripts/screenshot @@ -0,0 +1,19 @@ +#!/bin/sh +case "${1:-}" in +desktop) + exec grim + ;; +output) + exec grim -o "$(swaymsg -t get_outputs | jq -r '.[] | select(.focused) | .name')" + ;; +window) + exec grim -g "$(swaymsg -t get_tree | + jq -j '.. | select(.type?) | select(.focused).rect | "\(.x),\(.y) \(.width)x\(.height)"')" + # TODO the second variant is newer but doesn't work with my version of sway + exec grim -T "$(swaymsg -t get_tree | + jq -j '.. | select(.type?) | select(.focused).foreign_toplevel_identifier')" + ;; +select) + exec grim -g "$(slurp)" + ;; +esac diff --git a/config/systemd/user/davmail.service b/config/systemd/user/davmail.service new file mode 100644 index 0000000..b0f239b --- /dev/null +++ b/config/systemd/user/davmail.service @@ -0,0 +1,5 @@ +[Unit] +Description=DavMail + +[Service] +ExecStart="/run/current-system/sw/bin/davmail" diff --git a/config/systemd/user/waybar.service b/config/systemd/user/waybar.service deleted file mode 100644 index 110ab83..0000000 --- a/config/systemd/user/waybar.service +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Description=Waybar - -[Service] -ExecStart="/run/current-system/sw/bin/waybar" - -[Install] -WantedBy="graphical-session.target" diff --git a/config/waybar/email.sh b/config/waybar/email.sh index 437566f..16b0d9f 100755 --- a/config/waybar/email.sh +++ b/config/waybar/email.sh @@ -10,7 +10,7 @@ fi part=() for mail in email gmail elektroline fel; do counts="$(notmuch count -- "${filter[@]}" and "tag:$mail")" - [ "$counts" = "0" ] || \ + [ "$counts" = "0" ] || part+=("$mail:$counts") done @@ -8,7 +8,9 @@ git submodule update --init --recursive || ( ) # Source inst and diff function +. ./utils/ask . ./utils/inst +. ./utils/guix # Load if we force changes (implies no interaction) [ "$1" = "-f" ] && FORCE=true || FORCE=false @@ -37,9 +39,11 @@ if ask "nix" "Install Nix configuration"; then inst private/config/nix/builders ~/.config/nix/builders fi -if ask "guix" "Install Guix configuration"; then +if hascmd guix && ask "guix" "Install Guix configuration"; then inst guile ~/.guile inst config/guix/channels.scm ~/.config/guix/channels.scm + guix_install \ + guile guile-colorized guile-readline guile-lsp-server fi if ask "cliutils" "Install configurations for various CLI utility tools"; then @@ -66,9 +70,9 @@ if ask "nvim" "Install NeoVIM scripts"; then nvim --headless -c 'autocmd User PackerComplete quitall' -c 'PackerSync' # cs spelling mkdir -p ~/.local/share/nvim/site/spell - curl "https://ftp.nluug.nl/pub/vim/runtime/spell/cs.utf-8.spl" \ + curl -L "https://ftp.nluug.nl/pub/vim/runtime/spell/cs.utf-8.spl" \ >~/.local/share/nvim/site/spell/cs.utf-8.spl - curl "https://ftp.nluug.nl/pub/vim/runtime/spell/cs.utf-8.sug" \ + curl -L "https://ftp.nluug.nl/pub/vim/runtime/spell/cs.utf-8.sug" \ >~/.local/share/nvim/site/spell/cs.utf-8.sug fi @@ -80,7 +84,6 @@ if ask "dev" "Development tools configuration"; then inst pylintrc ~/.pylintrc inst config/mypy/ ~/.config/mypy inst local/bin/new-flake-dev ~/.local/bin/new-flake-dev - inst shvcli.ini ~/.shvcli.ini curl "https://github.com/cyrus-and/gdb-dashboard/raw/master/.gdbinit" >~/.gdbinit fi @@ -89,16 +92,17 @@ if ask "sync" "Install synchronization"; then if [ "$(ps -o comm= 1)" = "systemd" ]; then inst config/systemd/user/allsync.service ~/.config/systemd/user/ inst config/systemd/user/allsync.timer ~/.config/systemd/user/ + inst config/systemd/user/davmail.service ~/.config/systemd/user/ fi inst private/mbsyncrc ~/.mbsyncrc + inst private/msmtprc ~/.msmtprc + inst private/davmail.properties ~/.davmail.properties inst private/notmuch-config ~/.notmuch-config inst private/notmuch-tag-new ~/.notmuch-tag-new inst local/bin/email-unread ~/.local/bin/email-unread inst local/sbin/newmail-notify ~/.local/sbin/newmail-notify - inst private/msmtprc ~/.msmtprc inst config/dodo/config.py ~/.config/dodo/config.py - inst private/astroid/config ~/.config/astroid/config inst private/vdirsyncer/ ~/.vdirsyncer inst config/khal/config ~/.config/khal/config @@ -132,7 +136,6 @@ if ask "desktop" "Install desktop"; then inst config/swaylock/ ~/.config/swaylock inst config/swayidle/ ~/.config/swayidle inst config/wofi/ ~/.config/wofi - inst config/systemd/user/waybar.service ~/.config/systemd/user/waybar.service [ -f "private/kanshi/$(hostname)" ] && inst "private/kanshi/$(hostname)" ~/.config/kanshi/config inst config/xdg-desktop-portal-wlr/ ~/.config/xdg-desktop-portal-wlr diff --git a/local/bin/allsync b/local/bin/allsync index 6e537e2..70c9d29 100755 --- a/local/bin/allsync +++ b/local/bin/allsync @@ -8,21 +8,22 @@ notify_bar() { i3_astroid() { pkill -0 astroid || return 0 - find "/run/user/$(id -u)/i3" "/tmp/i3-$(id -un)".* -name ipc-socket\* 2>/dev/null | \ + find "/run/user/$(id -u)/i3" "/tmp/i3-$(id -un)".* -name ipc-socket\* 2>/dev/null | while read -r socket; do i3-msg -s "$socket" "exec astroid $*" - done + done } cron_enable() { pass mail/cynerd@email.cz >/dev/null # Cache keys if command -v crontab >/dev/null; then { - crontab -l + crontab -l echo "$cronline" } | crontab - else systemctl --user start allsync.timer + systemctl --user start davmail.service fi notify_bar } @@ -46,33 +47,33 @@ cron_enabled() { if [ "$#" -gt 0 ]; then case "$1" in - enable) - cron_enable - ;; - disable) + enable) + cron_enable + ;; + disable) + cron_disable + ;; + enabled) + cron_enabled + ;; + state) + if cron_enabled; then + echo "Enabled" + else + echo "Disabled" + fi + ;; + toggle) + if cron_enabled; then cron_disable - ;; - enabled) - cron_enabled - ;; - state) - if cron_enabled; then - echo "Enabled" - else - echo "Disabled" - fi - ;; - toggle) - if cron_enabled; then - cron_disable - else - cron_enable - fi - ;; - *) - echo "${0##*/}: Unknown argument: $1" >&2 - exit 1 - ;; + else + cron_enable + fi + ;; + *) + echo "${0##*/}: Unknown argument: $1" >&2 + exit 1 + ;; esac exit fi @@ -97,7 +98,6 @@ if [ "${ALLSYNC_FLOCK:-n}" != "y" ]; then exit 1 fi - sec() { echo -e '\e[1;34m==========' "$@" '==========\e[0m' } @@ -108,18 +108,15 @@ fail() { ecode=1 } - sec "Passwords" pass git pull || fail "Passwords pull failed" pass git push || fail "Passwords push failed" sec "Mail" -i3_astroid --start-polling mbsync -a || fail "Mail synchronization reported failure" notmuch new ~/.local/sbin/newmail-notify || fail "Mail notifications not sent" notmuch tag --batch --input="$HOME/.notmuch-tag-new" -i3_astroid --stop-polling notify_bar #sec "Calendar and contacts" diff --git a/local/bin/cloud b/local/bin/cloud index db6e717..187db18 100755 --- a/local/bin/cloud +++ b/local/bin/cloud @@ -19,8 +19,21 @@ while getopts "u" opt; do done if [ "$umount" = "n" ]; then + url="https://cloud.cynerd.cz/remote.php/dav/files/cynerd" + conf="$(mktemp)" + secrets="$(mktemp)" + trap 'rm -f "$conf" "$secrets"' EXIT HUP INT QUIT SEGV PIPE TERM + cat >"$conf" <<-EOF + [$path] + secrets ${secrets} + use_locks 0 + EOF + chmod 600 "$secrets" + echo "$url cynerd $(pass cynerd.cz/nextcloud/davfs)" >"$secrets" + sudo chown root "$secrets" sudo mkdir -p "$path" - sudo mount.davfs -o uid=1000,username=cynerd "https://cloud.cynerd.cz/remote.php/dav/files/cynerd" "$path" + sudo mount.davfs -o "conf=${conf}" -o uid=1000 "$url" "$path" + sudo rm -f "$secrets" else sudo umount "$path" fi diff --git a/local/bin/elektroline00 b/local/bin/elektroline00 index 7a21cd6..99664d2 100755 --- a/local/bin/elektroline00 +++ b/local/bin/elektroline00 @@ -20,6 +20,7 @@ done if [ "$umount" = "n" ]; then mount_cifs() { + sudo mkdir -p "$path/$2" sudo --preserve-env=PASSWD mount.cifs -o username=kkoci,uid=1000 "$1" "$path/$2" echo "Mounted $path/$2" } diff --git a/local/bin/new-flake-dev b/local/bin/new-flake-dev index 360a94e..c28f2fd 100755 --- a/local/bin/new-flake-dev +++ b/local/bin/new-flake-dev @@ -11,10 +11,15 @@ cat >./flake.nix <<"EOF" systems, nixpkgs, }: let - inherit (nixpkgs.lib) genAttrs; + inherit (nixpkgs.lib) genAttrs composeManyExtensions; forSystems = genAttrs (import systems); withPkgs = func: forSystems (system: func self.legacyPackages.${system}); in { + overlays = { + packages = final: prev: {}; + default = composeManyExtensions [self.overlays.packages]; + }; + devShells = withPkgs (pkgs: { default = with pkgs; mkShell { diff --git a/local/bin/project-test b/local/bin/project-test index e8c6261..feab447 100755 --- a/local/bin/project-test +++ b/local/bin/project-test @@ -15,21 +15,21 @@ print_help() { while [ -n "$1" ]; do case $1 in - -r|--ref) - shift - REF=$1 - ;; - -c|--count) - shift - REF=HEAD~$1 - ;; - --) - shift - break - ;; - *) - break - ;; + -r | --ref) + shift + REF=$1 + ;; + -c | --count) + shift + REF=HEAD~$1 + ;; + --) + shift + break + ;; + *) + break + ;; esac shift done diff --git a/local/bin/startsway b/local/bin/startsway index 3982c19..262a997 100755 --- a/local/bin/startsway +++ b/local/bin/startsway @@ -14,9 +14,10 @@ export MOZ_ENABLE_WAYLAND=1 # Java application do not display properly export _JAVA_AWT_WM_NONREPARENTING=1 -dbus="dbus-run-session" if [ "$(ps -o comm= 1)" = "systemd" ]; then - dbus="" + launch="systemd-cat --identifier=sway --stderr-priority=err" +else + launch="dbus-run-session" fi -exec $dbus sway +exec $launch sway diff --git a/private b/private -Subproject f2f279e7aa71f2b72f34ad8ec5100725d24d8b9 +Subproject 10d7c501c5a3c08670ba74098bfd81db3baf600 diff --git a/shvcli.ini b/shvcli.ini deleted file mode 100644 index 66caf52..0000000 --- a/shvcli.ini +++ /dev/null @@ -1,7 +0,0 @@ -[hosts] -localhost = tcp://admin@localhost?password=admin!123 -test = tcp://test@localhost?password=test -brcg2 = tcp://cli@localhost - -[hosts-shell] -nirvana = tcp://kkoci@nirvana.elektroline.cz:3756?password=$(pass elektroline.cz/nirvana/kkoci) diff --git a/shvcli.toml b/shvcli.toml index 5a3e9e8..0c262b4 100644 --- a/shvcli.toml +++ b/shvcli.toml @@ -2,7 +2,9 @@ localhost = "tcp://admin@localhost?password=admin!123" test = "tcp://test@localhost?password=test" brcg2 = "tcp://cli@localhost" +nirvanaa = "tcp://kkoci@nirvana.elektroline.cz:3755?oauth2=y" [hosts-shell] -nirvana = "tcp://kkoci@nirvana.elektroline.cz:3756?password=$(pass elektroline.cz/nirvana/kkoci)" +nirvana = "tcp://kkoci@nirvana.elektroline.cz:3755?password=$(pass elektroline.cz/nirvana/kkoci)" +nirvana-old = "tcp://kkoci@nirvana.elektroline.cz:3756?password=$(pass elektroline.cz/nirvana/kkoci)" ats = "tcp://atsshv@czellats.elektroline.cz?password=$(pass elektroline.cz/czellats/atsshv)" diff --git a/utils/ask b/utils/ask new file mode 100644 index 0000000..4b47c7e --- /dev/null +++ b/utils/ask @@ -0,0 +1,24 @@ +# vim: ft=sh + +# Ask if given section should be installed +# First argument is name (take care not to use special characters for regulard +# expression) and second argument is a question +ask() { + local ignore_file + ignore_file=".ignore-$(hostname)" + [ -f "$ignore_file" ] && grep -q "^$1$" "$ignore_file" && return 1 + if $FORCE; then + echo "\e[1;34m$2\e[0m" + # Fall trough with 0 exit (always yes) + else + echo -e -n "\e[1;34m$2? (Y/n) \e[0m" + local reply + read -r reply + echo "$reply" | grep -qE '^[Yy]?$' + fi +} + +# Check if command is available +hascmd() { + command -v "$1" >/dev/null 2>&1 +} diff --git a/utils/guix b/utils/guix new file mode 100644 index 0000000..bbfb8e5 --- /dev/null +++ b/utils/guix @@ -0,0 +1,16 @@ +# Functions used for interactive installation of new changes to running system +# vim: ft=sh + +guix_install() { + local installed + installed="$(guix package --list-installed)" + local -a toinstall + for pkg in "$@"; do + if awk -v ec=0 -v "PKG=$pkg" '$1 == PKG { ec = 1; } END { exit ec; }' <<<"$installed"; then + toinstall+=("$pkg") + fi + done + if [[ "${#toinstall[@]}" -gt 0 ]]; then + guix install "${toinstall[@]}" + fi +} @@ -1,45 +1,29 @@ # Functions used for interactive installation of new changes to running system # vim: ft=sh -# Ask if given section should be installed -# First argument is name (take care not to use special characters for regulard -# expression) and second argument is a question -ask() { - local ignore_file=".ignore-$(hostname)" - [ -f "$ignore_file" ] && grep -q "^$1$" "$ignore_file" && return 1 - if $FORCE; then - echo "\e[1;34m$2\e[0m" - # Fall trough with 0 exit (always yes) - else - echo -e -n "\e[1;34m$2? (Y/n) \e[0m" - local reply - read -r reply - echo "$reply" | grep -qE '^[Yy]?$' - fi -} - dodiff() { + local out if [ -d "$2" ]; then # If we just copying some file to directory - OUT=$2/$(basename "$1") + out="$2/$(basename "$1")" else - OUT=$2 + out="$2" fi - if ! [ -f "$OUT" ]; then - echo -e "\e[1;33mNot installed:\e[0m $1 => $OUT" + if ! [ -f "$out" ]; then + echo -e "\e[1;33mNot installed:\e[0m $1 => $out" if ask "Install?"; then - doinst "$1" "$OUT" + doinst "$1" "$out" fi return fi - if cmp "$1" "$OUT" >/dev/null 2>&1; then - echo -e "\e[1;32mNo difference detected:\e[0m $OUT" + if cmp "$1" "$out" >/dev/null 2>&1; then + echo -e "\e[1;32mNo difference detected:\e[0m $out" return fi if $FORCE; then - doinst "$1" "$OUT" + doinst "$1" "$out" else - nvim -d "$1" "$OUT" + nvim -d "$1" "$out" fi } @@ -48,11 +32,12 @@ dodiff() { # commands not on deployed tree but on tree in this repository, so we need specify # work tree on command line every time we want target deployed work tree. gitrepo_relink() { - local GITD="gitdir: $PWD/.git$(sed "s/^gitdir: [./]*git//" "$1")" + local gitdir + gitdir="gitdir: $PWD/.git$(sed "s/^gitdir: [./]*git//" "$1")" # We check that we are pointing to correct path just because of making message correct - if ! grep -q "$GITD" "$2"; then + if ! grep -q "$gitdir" "$2"; then echo -e "\e[1;34mPointing git repository $2 to this repository\e[0m" - echo "$GITD" > "$2" + echo "$gitdir" >"$2" fi # else probably not a git repository or who knows. } @@ -69,12 +54,12 @@ checkdiff() { exit 1 fi # Got trough all files ignoring git repositories - for f in `find "$1" \( -type d -exec test -e '{}'/.git \; \) -prune -o -type f -print`; do + for f in $(find "$1" \( -type d -exec test -e '{}'/.git \; \) -prune -o -type f -print); do F="${f#$1}" dodiff "$1/$F" "$2/$F" done # Check if we have all directories ignoring those in git repositories - for d in `find "$1" -type d -print -exec test -e '{}'/.git \; -prune`; do + for d in $(find "$1" -type d -print -exec test -e '{}'/.git \; -prune); do D="${d#$1}" if [ ! -d "$2/$D" ]; then echo -e "\e[1;33mDirectory not installed:\e[0m $1/$D => $2/$D" @@ -84,7 +69,7 @@ checkdiff() { fi done # Now checkout git repositories - for g in `find "$1" -type d -exec test -e '{}'/.git \; -print -prune`; do + for g in $(find "$1" -type d -exec test -e '{}'/.git \; -print -prune); do G="$2/${g#$1}" gitrepo_relink "$g/.git" "$G/.git" # Always reling .git just to be sure PREV="$(pwd)" @@ -111,13 +96,13 @@ doinst() { mkdir -p "$(dirname "$2")" rsync -rlpt $1 $2 # Now edit all .git files in target directory - for g in `find "$1" -name '.git' -type f`; do + for g in $(find "$1" -name '.git' -type f); do gitrepo_relink "$g" "$2/${g#$1}" done } inst() { - if [ ! -e "$1" ]; then + if [ ! -e "$1" ]; then echo "Missing file to be installed: $1" >&2 fi if [ -e "$2" ]; then |