From 27b266450ba0d02357769fe97b9ddc365229f38a Mon Sep 17 00:00:00 2001 From: Alison Watson Date: Mon, 19 Aug 2019 09:40:45 -0400 Subject: [PATCH] file dance --- .gitignore | 2 +- applications/fish | 12 ++++-------- {scripts => build-system}/rebuild-pkgs.rkt | 0 {scripts => build-system}/rebuild.rkt | 16 ++++++++-------- {scripts/fish => fish}/bindings | 0 {scripts/fish => fish}/build-hosts | 0 {scripts/fish => fish}/cheat | 0 {scripts/fish => fish}/crtolf | 0 {scripts/fish => fish}/find-no-album-artist | 0 {scripts/fish => fish}/find-stereo | 0 {scripts/fish => fish}/flac2mp3 | 0 {scripts/fish => fish}/generate-grub | 0 {scripts/fish => fish}/homebrew | 0 {scripts/fish => fish}/makepkg | 0 {scripts/fish => fish}/megadl | 0 {scripts/fish => fish}/prompt | 2 +- {scripts/fish => fish}/ql | 0 {scripts/fish => fish}/rebuild | 2 +- {scripts/fish => fish}/show-colors | 0 {scripts/fish => fish}/transfer | 0 {scripts/fish => fish}/update-vim-plugins | 0 {scripts/fish => fish}/vm-macemu | 0 {scripts/fish => fish}/vm-nextemu | 2 +- {scripts/fish => fish}/vm-qemu | 2 +- {scripts/fish => fish}/vnc | 0 {scripts => sshot}/sharenix | 0 {scripts => sshot}/sharenix-cw | 2 +- {scripts => sshot}/sharenix-fs | 2 +- {scripts => sshot}/sharenix-sel | 2 +- {scripts => system/services}/hourly | 0 system/services/marrub.service | 2 +- {scripts => text}/merge-ini | 0 {scripts/text => text}/mid.awk | 0 {scripts/text => text}/newcomments.sed | 0 {scripts/text => text}/newcomments2.sed | 0 {scripts/text => text}/oldcomments.sed | 0 36 files changed, 21 insertions(+), 25 deletions(-) rename {scripts => build-system}/rebuild-pkgs.rkt (100%) rename {scripts => build-system}/rebuild.rkt (88%) rename {scripts/fish => fish}/bindings (100%) rename {scripts/fish => fish}/build-hosts (100%) rename {scripts/fish => fish}/cheat (100%) rename {scripts/fish => fish}/crtolf (100%) rename {scripts/fish => fish}/find-no-album-artist (100%) rename {scripts/fish => fish}/find-stereo (100%) rename {scripts/fish => fish}/flac2mp3 (100%) rename {scripts/fish => fish}/generate-grub (100%) rename {scripts/fish => fish}/homebrew (100%) rename {scripts/fish => fish}/makepkg (100%) rename {scripts/fish => fish}/megadl (100%) rename {scripts/fish => fish}/prompt (91%) rename {scripts/fish => fish}/ql (100%) rename {scripts/fish => fish}/rebuild (63%) rename {scripts/fish => fish}/show-colors (100%) rename {scripts/fish => fish}/transfer (100%) rename {scripts/fish => fish}/update-vim-plugins (100%) rename {scripts/fish => fish}/vm-macemu (100%) rename {scripts/fish => fish}/vm-nextemu (92%) rename {scripts/fish => fish}/vm-qemu (71%) rename {scripts/fish => fish}/vnc (100%) rename {scripts => sshot}/sharenix (100%) rename {scripts => sshot}/sharenix-cw (50%) rename {scripts => sshot}/sharenix-fs (50%) rename {scripts => sshot}/sharenix-sel (50%) rename {scripts => system/services}/hourly (100%) rename {scripts => text}/merge-ini (100%) rename {scripts/text => text}/mid.awk (100%) rename {scripts/text => text}/newcomments.sed (100%) rename {scripts/text => text}/newcomments2.sed (100%) rename {scripts/text => text}/oldcomments.sed (100%) diff --git a/.gitignore b/.gitignore index b76e1ce..df7d7a2 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -scripts/fish/priv +fish/priv diff --git a/applications/fish b/applications/fish index 6d687b6..59c0b41 100644 --- a/applications/fish +++ b/applications/fish @@ -7,10 +7,9 @@ end # bootstrapping information # required universal variables: -# - _agw_dir_bin = volatile binary storage -# - _agw_dir_rc = the directory holding this repository -# - _agw_dir_scripts = the directory for user-facing scripts -# - _agw_dir_src = non-volatile source code storage +# - _agw_dir_bin = volatile binary storage +# - _agw_dir_rc = the directory holding this repository +# - _agw_dir_src = non-volatile source code storage switch (uname) case Linux set -gx CC clang @@ -19,7 +18,6 @@ switch (uname) set -gx RIPGREP_CONFIG_PATH ~/.config/ripgreprc set -Ux _agw_dir_bin ~/bin set -Ux _agw_dir_rc ~/rc - set -Ux _agw_dir_scripts ~/rc/scripts set -Ux _agw_dir_src ~/src case Darwin set -gx CMAKE_PREFIX_PATH /usr/local/opt/qt/ @@ -29,7 +27,6 @@ switch (uname) set -gx fish_user_paths "/usr/local/opt/ruby/bin" $fish_user_paths set -Ux _agw_dir_bin ~/Binaries set -Ux _agw_dir_rc ~/Sources/scripts - set -Ux _agw_dir_scripts ~/Scripts set -Ux _agw_dir_src ~/Sources case NetBSD # Yes, these are *actually* needed. @@ -50,7 +47,6 @@ switch (uname) set -gx PKG_PATH "http://cdn.NetBSD.org/pub/pkgsrc/packages/NetBSD/"(uname -p)"/"(uname -r|cut -f '1 2' -d.|cut -f 1 -d_)"/All" set -Ux _agw_dir_bin ~/bin set -Ux _agw_dir_rc ~/rc - set -Ux _agw_dir_scripts ~/rc/scripts set -Ux _agw_dir_src ~/src case \* echo (set_color red)"This platform is not configured!" @@ -61,7 +57,7 @@ if test -f ~/.cargo/env source ~/.cargo/env end -for f in (find $_agw_dir_scripts/fish -type f) +for f in (find $_agw_dir_rc/fish -type f) source $f end diff --git a/scripts/rebuild-pkgs.rkt b/build-system/rebuild-pkgs.rkt similarity index 100% rename from scripts/rebuild-pkgs.rkt rename to build-system/rebuild-pkgs.rkt diff --git a/scripts/rebuild.rkt b/build-system/rebuild.rkt similarity index 88% rename from scripts/rebuild.rkt rename to build-system/rebuild.rkt index 10dbda3..3dc62d2 100755 --- a/scripts/rebuild.rkt +++ b/build-system/rebuild.rkt @@ -67,8 +67,8 @@ (define (resume-from-pkg input-pkg [pkg-list all-packages]) (let ([package (car pkg-list)]) (if (equal? package input-pkg) - pkg-list - (resume-from-pkg input-pkg (cdr pkg-list))))) + pkg-list + (resume-from-pkg input-pkg (cdr pkg-list))))) (let* ([resume-from (make-parameter '())] [cmdline-pkgs (command-line @@ -78,12 +78,12 @@ (resume-from pkg)] #:args pkgs (map string->symbol pkgs))] [pkgs (if (null? cmdline-pkgs) - (let ([input-package (resume-from)]) - (if (null? input-package) - all-packages - (resume-from-pkg (string->symbol input-package)))) - cmdline-pkgs)]) + (let ([input-package (resume-from)]) + (if (null? input-package) + all-packages + (resume-from-pkg (string->symbol input-package)))) + cmdline-pkgs)]) (for ([package pkgs]) - (build-pkg package (hash-ref package-options package (hash))))) + (build-pkg package (hash-ref package-options package (hash))))) ;; EOF diff --git a/scripts/fish/bindings b/fish/bindings similarity index 100% rename from scripts/fish/bindings rename to fish/bindings diff --git a/scripts/fish/build-hosts b/fish/build-hosts similarity index 100% rename from scripts/fish/build-hosts rename to fish/build-hosts diff --git a/scripts/fish/cheat b/fish/cheat similarity index 100% rename from scripts/fish/cheat rename to fish/cheat diff --git a/scripts/fish/crtolf b/fish/crtolf similarity index 100% rename from scripts/fish/crtolf rename to fish/crtolf diff --git a/scripts/fish/find-no-album-artist b/fish/find-no-album-artist similarity index 100% rename from scripts/fish/find-no-album-artist rename to fish/find-no-album-artist diff --git a/scripts/fish/find-stereo b/fish/find-stereo similarity index 100% rename from scripts/fish/find-stereo rename to fish/find-stereo diff --git a/scripts/fish/flac2mp3 b/fish/flac2mp3 similarity index 100% rename from scripts/fish/flac2mp3 rename to fish/flac2mp3 diff --git a/scripts/fish/generate-grub b/fish/generate-grub similarity index 100% rename from scripts/fish/generate-grub rename to fish/generate-grub diff --git a/scripts/fish/homebrew b/fish/homebrew similarity index 100% rename from scripts/fish/homebrew rename to fish/homebrew diff --git a/scripts/fish/makepkg b/fish/makepkg similarity index 100% rename from scripts/fish/makepkg rename to fish/makepkg diff --git a/scripts/fish/megadl b/fish/megadl similarity index 100% rename from scripts/fish/megadl rename to fish/megadl diff --git a/scripts/fish/prompt b/fish/prompt similarity index 91% rename from scripts/fish/prompt rename to fish/prompt index 829930d..5277bbb 100644 --- a/scripts/fish/prompt +++ b/fish/prompt @@ -23,7 +23,7 @@ function fish_greeting set_color c50ed2 echo "Word of the moment: "(shuf -n1 /usr/share/dict/words) | - awk -f $_agw_dir_scripts/text/mid.awk col=$COLUMNS + awk -f $_agw_dir_rc/text/mid.awk col=$COLUMNS set_color normal end diff --git a/scripts/fish/ql b/fish/ql similarity index 100% rename from scripts/fish/ql rename to fish/ql diff --git a/scripts/fish/rebuild b/fish/rebuild similarity index 63% rename from scripts/fish/rebuild rename to fish/rebuild index 606b4ab..3906c66 100644 --- a/scripts/fish/rebuild +++ b/fish/rebuild @@ -1,7 +1,7 @@ #!/usr/bin/env fish function rebuild -d 'Builds an AUR package' - $_agw_dir_scripts/rebuild.rkt $argv + $_agw_dir_rc/build-system/rebuild.rkt $argv end ## EOF diff --git a/scripts/fish/show-colors b/fish/show-colors similarity index 100% rename from scripts/fish/show-colors rename to fish/show-colors diff --git a/scripts/fish/transfer b/fish/transfer similarity index 100% rename from scripts/fish/transfer rename to fish/transfer diff --git a/scripts/fish/update-vim-plugins b/fish/update-vim-plugins similarity index 100% rename from scripts/fish/update-vim-plugins rename to fish/update-vim-plugins diff --git a/scripts/fish/vm-macemu b/fish/vm-macemu similarity index 100% rename from scripts/fish/vm-macemu rename to fish/vm-macemu diff --git a/scripts/fish/vm-nextemu b/fish/vm-nextemu similarity index 92% rename from scripts/fish/vm-nextemu rename to fish/vm-nextemu index b1b2409..3246678 100644 --- a/scripts/fish/vm-nextemu +++ b/fish/vm-nextemu @@ -6,7 +6,7 @@ function vm-nextemu -d "Frontend to Previous" -a cfg touch $config chmod u+w $config - $_agw_dir_scripts/merge-ini \ + $_agw_dir_rc/text/merge-ini \ $_agw_dir_rc/virtual-machines/NeXT/common \ $_agw_dir_rc/virtual-machines/NeXT/$cfg \ $config diff --git a/scripts/fish/vm-qemu b/fish/vm-qemu similarity index 71% rename from scripts/fish/vm-qemu rename to fish/vm-qemu index da3fa4f..3dd044b 100644 --- a/scripts/fish/vm-qemu +++ b/fish/vm-qemu @@ -1,7 +1,7 @@ #!/usr/bin/env fish function vm-qemu -d "Frontend to QEMU" - $_agw_dir_rc/virtual-machines/qemu-setup $argv + $_agw_dir_rc/virtual-machines/QEMU/vm-qemu.rkt $argv end complete -c vm-qemu -xa "(ls $_agw_dir_rc/virtual-machines)" diff --git a/scripts/fish/vnc b/fish/vnc similarity index 100% rename from scripts/fish/vnc rename to fish/vnc diff --git a/scripts/sharenix b/sshot/sharenix similarity index 100% rename from scripts/sharenix rename to sshot/sharenix diff --git a/scripts/sharenix-cw b/sshot/sharenix-cw similarity index 50% rename from scripts/sharenix-cw rename to sshot/sharenix-cw index 653c1a1..7b2eb22 100755 --- a/scripts/sharenix-cw +++ b/sshot/sharenix-cw @@ -1,4 +1,4 @@ #!/usr/bin/env fish -source "$_agw_dir_scripts/sharenix" +source "$_agw_dir_rc/sshot/sharenix" run_spectacle -a diff --git a/scripts/sharenix-fs b/sshot/sharenix-fs similarity index 50% rename from scripts/sharenix-fs rename to sshot/sharenix-fs index 7e8cb83..2cda89e 100755 --- a/scripts/sharenix-fs +++ b/sshot/sharenix-fs @@ -1,4 +1,4 @@ #!/usr/bin/env fish -source "$_agw_dir_scripts/sharenix" +source "$_agw_dir_rc/sshot/sharenix" run_spectacle -m diff --git a/scripts/sharenix-sel b/sshot/sharenix-sel similarity index 50% rename from scripts/sharenix-sel rename to sshot/sharenix-sel index 74491c7..ad32c3a 100755 --- a/scripts/sharenix-sel +++ b/sshot/sharenix-sel @@ -1,4 +1,4 @@ #!/usr/bin/env fish -source "$_agw_dir_scripts/sharenix" +source "$_agw_dir_rc/sshot/sharenix" run_spectacle -r diff --git a/scripts/hourly b/system/services/hourly similarity index 100% rename from scripts/hourly rename to system/services/hourly diff --git a/system/services/marrub.service b/system/services/marrub.service index c8a7836..4188a3e 100644 --- a/system/services/marrub.service +++ b/system/services/marrub.service @@ -2,7 +2,7 @@ Description=Run some crap [Service] -ExecStart=/usr/bin/env fish --command='$_agw_dir_scripts/hourly' +ExecStart=/usr/bin/env fish --command='$_agw_dir_rc/system/services/hourly' [Install] WantedBy=basic.target diff --git a/scripts/merge-ini b/text/merge-ini similarity index 100% rename from scripts/merge-ini rename to text/merge-ini diff --git a/scripts/text/mid.awk b/text/mid.awk similarity index 100% rename from scripts/text/mid.awk rename to text/mid.awk diff --git a/scripts/text/newcomments.sed b/text/newcomments.sed similarity index 100% rename from scripts/text/newcomments.sed rename to text/newcomments.sed diff --git a/scripts/text/newcomments2.sed b/text/newcomments2.sed similarity index 100% rename from scripts/text/newcomments2.sed rename to text/newcomments2.sed diff --git a/scripts/text/oldcomments.sed b/text/oldcomments.sed similarity index 100% rename from scripts/text/oldcomments.sed rename to text/oldcomments.sed