diff --git a/groups/arch/all b/groups/arch/all new file mode 100644 index 0000000..fd02d34 --- /dev/null +++ b/groups/arch/all @@ -0,0 +1,4 @@ +arch/full +game + +zulip diff --git a/groups/arch/base b/groups/arch/base new file mode 100644 index 0000000..7676768 --- /dev/null +++ b/groups/arch/base @@ -0,0 +1,18 @@ +arch/tools +shell/all +cronie +doom +syncthing +kdeconnect +instalee +passwords +dev/most +track +office +lilypond +chordpro +refind +bluetooth +openvpn +borg +signal diff --git a/groups/arch/full b/groups/arch/full index f682a9d..122c48f 100644 --- a/groups/arch/full +++ b/groups/arch/full @@ -1,15 +1,14 @@ -arch/tools -shell/music -cronie -doom -syncthing -kdeconnect -instalee -passwords -dev/most -track -office +arch/base composing -refind -bluetooth -openvpn +media/mix +media/video +dev + +osm +mount +forensics + +telegram +lemonade +caddy +samba diff --git a/groups/arch/portable b/groups/arch/portable index 7aed99e..b8f82c7 100644 --- a/groups/arch/portable +++ b/groups/arch/portable @@ -1,3 +1,3 @@ -arch/full +arch/base intel-ucode amd-ucode diff --git a/groups/arch/tools b/groups/arch/tools index 0561902..68960d3 100644 --- a/groups/arch/tools +++ b/groups/arch/tools @@ -17,3 +17,4 @@ dex inotify-tools entr dragon-drop +wifi-qr diff --git a/groups/dev/docs b/groups/dev/docs new file mode 100644 index 0000000..4fe9a42 --- /dev/null +++ b/groups/dev/docs @@ -0,0 +1,4 @@ +texinfo +tldr +dasht +zeal diff --git a/groups/dev/haskell b/groups/dev/haskell new file mode 100644 index 0000000..49fef26 --- /dev/null +++ b/groups/dev/haskell @@ -0,0 +1,2 @@ +nix +nix-docs diff --git a/groups/dev/most b/groups/dev/most index 78dbd35..42af473 100644 --- a/groups/dev/most +++ b/groups/dev/most @@ -2,4 +2,4 @@ dev/tools fossil dev/socha dev/node -dev/ruby +dev/docs diff --git a/groups/dev/socha b/groups/dev/socha index 25f012e..22b76c9 100644 --- a/groups/dev/socha +++ b/groups/dev/socha @@ -1,5 +1,3 @@ dev/java -notion +dev/ruby docker -docker-compose -phantomjs diff --git a/groups/dev/socha-all b/groups/dev/socha-all new file mode 100644 index 0000000..532d54e --- /dev/null +++ b/groups/dev/socha-all @@ -0,0 +1,3 @@ +dev/socha +notion +docker-compose diff --git a/groups/docs b/groups/docs index f919096..de1baea 100644 --- a/groups/docs +++ b/groups/docs @@ -1,3 +1,4 @@ plantuml tex pandoc +vega diff --git a/groups/forensics b/groups/forensics index a1d88d2..2b7f3a3 100644 --- a/groups/forensics +++ b/groups/forensics @@ -1,3 +1,6 @@ +nmap +bind +libguestfs testdisk recuva sandboxie diff --git a/groups/framework b/groups/framework new file mode 100644 index 0000000..853628a --- /dev/null +++ b/groups/framework @@ -0,0 +1 @@ +auto-cpufreq diff --git a/groups/mount b/groups/mount new file mode 100644 index 0000000..4df981e --- /dev/null +++ b/groups/mount @@ -0,0 +1,5 @@ +samba +fuseiso +android-fs +android-tools +aafm-git diff --git a/groups/osm b/groups/osm new file mode 100644 index 0000000..c0f4cc7 --- /dev/null +++ b/groups/osm @@ -0,0 +1,2 @@ +shell/osm +josm diff --git a/groups/shell/all b/groups/shell/all index 8787092..66c88b6 100644 --- a/groups/shell/all +++ b/groups/shell/all @@ -2,3 +2,5 @@ shell/tools shell/enhancements shell/preview shell/power +shell/music +shell/monitor diff --git a/groups/shell/monitor b/groups/shell/monitor index d67fea0..c9ad190 100644 --- a/groups/shell/monitor +++ b/groups/shell/monitor @@ -1,2 +1,3 @@ smartmontools lnav +logwatch diff --git a/groups/shell/tools b/groups/shell/tools index c01fa2b..61b34ba 100644 --- a/groups/shell/tools +++ b/groups/shell/tools @@ -13,4 +13,4 @@ strace timg tmux jq -dd +bc diff --git a/handlers.available.deb b/handlers.available.debian similarity index 100% rename from handlers.available.deb rename to handlers.available.debian diff --git a/handlers.available.ubuntu b/handlers.available.ubuntu new file mode 100644 index 0000000..1b9e7e8 --- /dev/null +++ b/handlers.available.ubuntu @@ -0,0 +1,4 @@ +ubuntu +apt +binary +linux diff --git a/handlers/apt/source b/handlers/apt/source new file mode 100755 index 0000000..65273ce --- /dev/null +++ b/handlers/apt/source @@ -0,0 +1,7 @@ +#!/bin/sh -e +sudo apt-get install -y debian-keyring debian-archive-keyring apt-transport-https +curl="curl --tlsv1.2 -fsSL $1" +case $1 in +(*.gpg) sudo $curl -o "$2";; +(*.key) $curl | sudo gpg --dearmor --yes -o "$2";; +(*) echo 'Unknown key type' >&2; false;; diff --git a/handlers/ubuntu/install b/handlers/ubuntu/install new file mode 100755 index 0000000..73eb7df --- /dev/null +++ b/handlers/ubuntu/install @@ -0,0 +1,2 @@ +#!/bin/sh +sudo apt-get install -y "$@" diff --git a/handlers/apt/ppa b/handlers/ubuntu/ppa similarity index 100% rename from handlers/apt/ppa rename to handlers/ubuntu/ppa diff --git a/i.ps1 b/i.ps1 index 79b5fe0..2828bec 100644 --- a/i.ps1 +++ b/i.ps1 @@ -3,4 +3,4 @@ packages\chocolatey\powershell.ps1 Start-Process -Wait choco -Verb runAs -ArgumentList 'install git' Start-Process -Wait "C:\Program Files\Git\git-bash.exe" -Verb runAs -ArgumentList "-c './instalee win/office; sleep 10 || bash'" -# Sleep 10 \ No newline at end of file +# Sleep 10 diff --git a/instalee b/instalee index 5200f2e..c8ea467 100755 --- a/instalee +++ b/instalee @@ -16,8 +16,8 @@ export dir_home="$(dirname $(find "$INSTALEE_HOME" \ handlersfile="$dir_home/handlers.available" dir_packages="$dir_home/packages" -highlight() { echo "$1" >&2; } -destress() { echo "$1" >&2; } +highlight() { echo $2 "$1" >&2; } +destress() { echo $2 "$1" >&2; } # Get the content of a file or the output of its execution getcontent() { @@ -46,7 +46,7 @@ installpkg() { local pkghandlers="$(find "$dir_package" -type f -printf "%f\n" 2>/dev/null)" for handler in $pkghandlers do installpkg --quiet "$handler" && - echo "$handler" >>"$pkghandlers" && + echo "$handler" >>"$handlersfile" && package_available_entries=$(getentries "$1") && break done @@ -77,12 +77,16 @@ installpkg() { local install args="$(getcontent "$pkg_entry")" args="${args:-$1}" - install="$(find "$handler" -name "install$ext" | head -1)" - destress " $install $args" - pkg_entry="$install $args" + installhandler="$(find "$handler" -name "install$ext")" + if test -n "$installhandler" + then pkg_entry="$installhandler $args" + else $(find "$handler" -name "${ext#_}") $args + pkg_entry="$(find "$handler" -name "install") $1" + fi else - destress " running unhandled $pkg_entry" + destress " running unhandled" -n fi + destress " $pkg_entry" $pkg_entry ) set +e @@ -135,7 +139,8 @@ case "$1" in while printf "Handler? (Ctrl-C or Ctrl-D to exit, / to list all) " && read handler do case "$handler" in - (/*) find "$dir_packages" "$dir_home/handlers" -type f -not -name "depends*" -printf "%f\n" | sort | uniq | paste -s -d ' ';; + (/*) find "$dir_packages" "$dir_home/handlers" -type f -not -name "depends*" -printf "%f\n" | + sort | uniq | paste -s -d ' ';; (*) ${EDITOR:-vi} "$dir/$handler";; esac done @@ -163,7 +168,6 @@ runinstalee() { fi } -# TODO Manjaro if ! test -f "$handlersfile" then copy="$(case "$(uname)" in (MINGW64*) echo "$dir_home/handlers.available.windows";; (*) find "$dir_home" -name "handlers.available.*" -exec sh -c "echo {} | rev | cut -d'.' -f1 | rev | xargs -i% expr $(lsb_release -s -i | tr 'A-Z' 'a-z' || cat /etc/os-release | grep '^ID=' | cut -d= -f2) : % >/dev/null" \; -a -print;; esac)" && diff --git a/packages/0ad/aur b/packages/0ad/aur new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/packages/0ad/aur @@ -0,0 +1 @@ + diff --git a/packages/abra/linux b/packages/abra/linux old mode 100644 new mode 100755 diff --git a/packages/android-tools/aur b/packages/android-tools/aur new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/packages/android-tools/aur @@ -0,0 +1 @@ + diff --git a/packages/bc/aur b/packages/bc/aur new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/packages/bc/aur @@ -0,0 +1 @@ + diff --git a/packages/bind/apt b/packages/bind/apt new file mode 100644 index 0000000..bca3eb0 --- /dev/null +++ b/packages/bind/apt @@ -0,0 +1 @@ +dnsutils diff --git a/packages/bind/arch b/packages/bind/arch new file mode 100644 index 0000000..05592b8 --- /dev/null +++ b/packages/bind/arch @@ -0,0 +1 @@ +bind diff --git a/packages/borg/aur b/packages/borg/aur new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/packages/borg/aur @@ -0,0 +1 @@ + diff --git a/packages/caddy/apt b/packages/caddy/apt new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/packages/caddy/apt @@ -0,0 +1 @@ + diff --git a/packages/caddy/aur b/packages/caddy/aur new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/packages/caddy/aur @@ -0,0 +1 @@ + diff --git a/packages/clion-jre/aur b/packages/clion-jre/aur new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/packages/clion-jre/aur @@ -0,0 +1 @@ + diff --git a/packages/clion/aur b/packages/clion/aur new file mode 100644 index 0000000..4bcd6d8 --- /dev/null +++ b/packages/clion/aur @@ -0,0 +1,2 @@ +clion +clion-jre diff --git a/packages/cmake/aur b/packages/cmake/aur new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/packages/cmake/aur @@ -0,0 +1 @@ + diff --git a/packages/dasht/aur b/packages/dasht/aur new file mode 100644 index 0000000..91f93c1 --- /dev/null +++ b/packages/dasht/aur @@ -0,0 +1 @@ +dasht diff --git a/packages/discord/aur b/packages/discord/aur new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/packages/discord/aur @@ -0,0 +1 @@ + diff --git a/packages/elasticsearch/apt b/packages/elasticsearch/apt old mode 100755 new mode 100644 diff --git a/packages/fuseiso/aur b/packages/fuseiso/aur new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/packages/fuseiso/aur @@ -0,0 +1 @@ + diff --git a/packages/gdb/aur b/packages/gdb/aur new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/packages/gdb/aur @@ -0,0 +1 @@ + diff --git a/packages/instalee/linux b/packages/instalee/linux index f7f5b3b..0a998a6 100755 --- a/packages/instalee/linux +++ b/packages/instalee/linux @@ -10,7 +10,7 @@ sudo install -D --target-directory "${usrdir}/share/man/man1/" "${_pkgname}.1" sudo install -D --target-directory "$bin" "${_pkgname}" pkgver="$({ git describe --long --tags 2>/dev/null || printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"; } | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g' )" -sudo sed -i "s/r%s.%s/version ${pkgver}/" "$bin/${_pkgname}" +sudo sed -i "s/r%s[^\"]*\"/version ${pkgver}\"/" "$bin/${_pkgname}" echo -n "Installed " $bin/instalee --version diff --git a/packages/josm/aur b/packages/josm/aur new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/packages/josm/aur @@ -0,0 +1 @@ + diff --git a/packages/kdenlive/aur b/packages/kdenlive/aur new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/packages/kdenlive/aur @@ -0,0 +1 @@ + diff --git a/packages/kubectl/apt b/packages/kubectl/apt index 575268f..b2ab183 100755 --- a/packages/kubectl/apt +++ b/packages/kubectl/apt @@ -1,4 +1,7 @@ #!/bin/sh -e -sudo curl -fsSLo /usr/share/keyrings/kubernetes-archive-keyring.gpg https://packages.cloud.google.com/apt/doc/apt-key.gpg +{ +sudo curl --tlsv1.2 -fsSLo /usr/share/keyrings/kubernetes-archive-keyring.gpg https://packages.cloud.google.com/apt/doc/apt-key.gpg echo "deb [signed-by=/usr/share/keyrings/kubernetes-archive-keyring.gpg] https://apt.kubernetes.io/ kubernetes-xenial main" | sudo tee /etc/apt/sources.list.d/kubernetes.list +sudo apt-get update +} >&2 echo kubectl diff --git a/packages/latex/aur b/packages/latex/aur new file mode 100644 index 0000000..a087cc5 --- /dev/null +++ b/packages/latex/aur @@ -0,0 +1,2 @@ +texlive-latexextra +inkscape diff --git a/packages/lemonade/aur b/packages/lemonade/aur new file mode 100644 index 0000000..bc6109b --- /dev/null +++ b/packages/lemonade/aur @@ -0,0 +1 @@ +lemonade-git diff --git a/packages/logcli/binary b/packages/logcli/binary old mode 100755 new mode 100644 diff --git a/packages/logwatch/aur b/packages/logwatch/aur new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/packages/logwatch/aur @@ -0,0 +1 @@ + diff --git a/packages/minetest/aur b/packages/minetest/aur new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/packages/minetest/aur @@ -0,0 +1 @@ + diff --git a/packages/neovim/aur b/packages/neovim/aur index 8b13789..197aa16 100644 --- a/packages/neovim/aur +++ b/packages/neovim/aur @@ -1 +1,2 @@ - +neovim +neovim-symlinks diff --git a/packages/nix-docs/aur b/packages/nix-docs/aur new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/packages/nix-docs/aur @@ -0,0 +1 @@ + diff --git a/packages/nix/arch_post b/packages/nix/arch_post new file mode 100755 index 0000000..df4ce24 --- /dev/null +++ b/packages/nix/arch_post @@ -0,0 +1,9 @@ +#!/bin/sh -e +# See https://wiki.archlinux.org/title/Nix +sudo usermod -aG nix-users $USER +nix-env --install +nix-channel --add https://nixos.org/channels/nixpkgs-unstable +nix-channel --update +test -f /etc/nix/nix.conf || echo "max-jobs = auto +trusted-users = root $USER" | sudo dd of=/etc/nix/nix.conf status=none +sudo systemctl enable --now nix-daemon diff --git a/packages/nmap/aur b/packages/nmap/aur new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/packages/nmap/aur @@ -0,0 +1 @@ + diff --git a/packages/obs-studio/arch b/packages/obs-studio/arch index b3e07a5..99dece9 100644 --- a/packages/obs-studio/arch +++ b/packages/obs-studio/arch @@ -1 +1,2 @@ obs-studio +qt6-wayland diff --git a/packages/opendungeons/aur b/packages/opendungeons/aur new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/packages/opendungeons/aur @@ -0,0 +1 @@ + diff --git a/packages/python-pre-commit/aur b/packages/python-pre-commit/aur new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/packages/python-pre-commit/aur @@ -0,0 +1 @@ + diff --git a/packages/rdictcc-git/aur b/packages/rdictcc-git/aur new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/packages/rdictcc-git/aur @@ -0,0 +1 @@ + diff --git a/packages/refind-theme-maia/aur b/packages/refind-theme-maia/aur new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/packages/refind-theme-maia/aur @@ -0,0 +1 @@ + diff --git a/packages/samba/aur b/packages/samba/aur new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/packages/samba/aur @@ -0,0 +1 @@ + diff --git a/packages/sauerbraten/aur b/packages/sauerbraten/aur new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/packages/sauerbraten/aur @@ -0,0 +1 @@ + diff --git a/packages/shared-mime-info/aur b/packages/shared-mime-info/aur new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/packages/shared-mime-info/aur @@ -0,0 +1 @@ + diff --git a/packages/smartmontools/aur b/packages/smartmontools/aur new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/packages/smartmontools/aur @@ -0,0 +1 @@ + diff --git a/packages/steam/aur b/packages/steam/aur new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/packages/steam/aur @@ -0,0 +1 @@ + diff --git a/packages/teeworlds/aur b/packages/teeworlds/aur new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/packages/teeworlds/aur @@ -0,0 +1 @@ + diff --git a/packages/telegram/arch b/packages/telegram/arch new file mode 100644 index 0000000..62c23ec --- /dev/null +++ b/packages/telegram/arch @@ -0,0 +1 @@ +telegram-desktop diff --git a/packages/telegram/apt_ppa b/packages/telegram/ubuntu_ppa similarity index 100% rename from packages/telegram/apt_ppa rename to packages/telegram/ubuntu_ppa diff --git a/packages/ttf-dejavu/aur b/packages/ttf-dejavu/aur new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/packages/ttf-dejavu/aur @@ -0,0 +1 @@ + diff --git a/packages/ttf-fira-code/aur b/packages/ttf-fira-code/aur new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/packages/ttf-fira-code/aur @@ -0,0 +1 @@ + diff --git a/packages/ttf-hack/aur b/packages/ttf-hack/aur new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/packages/ttf-hack/aur @@ -0,0 +1 @@ + diff --git a/packages/vega/npm b/packages/vega/npm new file mode 100644 index 0000000..bb06939 --- /dev/null +++ b/packages/vega/npm @@ -0,0 +1,2 @@ +vega +vega-lite diff --git a/packages/warzone2100/aur b/packages/warzone2100/aur new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/packages/warzone2100/aur @@ -0,0 +1 @@ + diff --git a/packages/wifi-qr/aur b/packages/wifi-qr/aur new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/packages/wifi-qr/aur @@ -0,0 +1 @@ + diff --git a/packages/xcaddy/apt b/packages/xcaddy/apt new file mode 100755 index 0000000..0157ad8 --- /dev/null +++ b/packages/xcaddy/apt @@ -0,0 +1,10 @@ +#!/bin/sh -e +{ +sudo apt-get install -y debian-keyring debian-archive-keyring apt-transport-https +curl --tlsv1.2 -sSLf 'https://dl.cloudsmith.io/public/caddy/xcaddy/gpg.key' | + sudo gpg --dearmor --yes -o /usr/share/keyrings/caddy-xcaddy-archive-keyring.gpg +curl --tlsv1.2 -sSLf 'https://dl.cloudsmith.io/public/caddy/xcaddy/debian.deb.txt' | + sudo tee /etc/apt/sources.list.d/caddy-xcaddy.list +sudo apt-get update +} >&2 +echo xcaddy diff --git a/packages/xkblayout-state/binary b/packages/xkblayout-state/binary old mode 100755 new mode 100644 diff --git a/packages/zeal/aur b/packages/zeal/aur new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/packages/zeal/aur @@ -0,0 +1 @@ +