Merge remote-tracking branch 'origin/main'
This commit is contained in:
commit
9e66e6de92
77 changed files with 162 additions and 33 deletions
4
groups/arch/all
Normal file
4
groups/arch/all
Normal file
|
@ -0,0 +1,4 @@
|
|||
arch/full
|
||||
game
|
||||
|
||||
zulip
|
18
groups/arch/base
Normal file
18
groups/arch/base
Normal file
|
@ -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
|
|
@ -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
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
arch/full
|
||||
arch/base
|
||||
intel-ucode
|
||||
amd-ucode
|
||||
|
|
|
@ -17,3 +17,4 @@ dex
|
|||
inotify-tools
|
||||
entr
|
||||
dragon-drop
|
||||
wifi-qr
|
||||
|
|
4
groups/dev/docs
Normal file
4
groups/dev/docs
Normal file
|
@ -0,0 +1,4 @@
|
|||
texinfo
|
||||
tldr
|
||||
dasht
|
||||
zeal
|
2
groups/dev/haskell
Normal file
2
groups/dev/haskell
Normal file
|
@ -0,0 +1,2 @@
|
|||
nix
|
||||
nix-docs
|
|
@ -2,4 +2,4 @@ dev/tools
|
|||
fossil
|
||||
dev/socha
|
||||
dev/node
|
||||
dev/ruby
|
||||
dev/docs
|
||||
|
|
|
@ -1,5 +1,3 @@
|
|||
dev/java
|
||||
notion
|
||||
dev/ruby
|
||||
docker
|
||||
docker-compose
|
||||
phantomjs
|
||||
|
|
3
groups/dev/socha-all
Normal file
3
groups/dev/socha-all
Normal file
|
@ -0,0 +1,3 @@
|
|||
dev/socha
|
||||
notion
|
||||
docker-compose
|
|
@ -1,3 +1,4 @@
|
|||
plantuml
|
||||
tex
|
||||
pandoc
|
||||
vega
|
||||
|
|
|
@ -1,3 +1,6 @@
|
|||
nmap
|
||||
bind
|
||||
libguestfs
|
||||
testdisk
|
||||
recuva
|
||||
sandboxie
|
||||
|
|
1
groups/framework
Normal file
1
groups/framework
Normal file
|
@ -0,0 +1 @@
|
|||
auto-cpufreq
|
5
groups/mount
Normal file
5
groups/mount
Normal file
|
@ -0,0 +1,5 @@
|
|||
samba
|
||||
fuseiso
|
||||
android-fs
|
||||
android-tools
|
||||
aafm-git
|
2
groups/osm
Normal file
2
groups/osm
Normal file
|
@ -0,0 +1,2 @@
|
|||
shell/osm
|
||||
josm
|
|
@ -2,3 +2,5 @@ shell/tools
|
|||
shell/enhancements
|
||||
shell/preview
|
||||
shell/power
|
||||
shell/music
|
||||
shell/monitor
|
||||
|
|
|
@ -1,2 +1,3 @@
|
|||
smartmontools
|
||||
lnav
|
||||
logwatch
|
||||
|
|
|
@ -13,4 +13,4 @@ strace
|
|||
timg
|
||||
tmux
|
||||
jq
|
||||
dd
|
||||
bc
|
||||
|
|
4
handlers.available.ubuntu
Normal file
4
handlers.available.ubuntu
Normal file
|
@ -0,0 +1,4 @@
|
|||
ubuntu
|
||||
apt
|
||||
binary
|
||||
linux
|
7
handlers/apt/source
Executable file
7
handlers/apt/source
Executable file
|
@ -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;;
|
2
handlers/ubuntu/install
Executable file
2
handlers/ubuntu/install
Executable file
|
@ -0,0 +1,2 @@
|
|||
#!/bin/sh
|
||||
sudo apt-get install -y "$@"
|
2
i.ps1
2
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
|
||||
# Sleep 10
|
||||
|
|
22
instalee
22
instalee
|
@ -16,8 +16,8 @@ export dir_home="$(dirname $(find "$INSTALEE_HOME" \
|
|||
handlersfile="$dir_home/handlers.available"
|
||||
dir_packages="$dir_home/packages"
|
||||
|
||||
highlight() { echo "[4m[1m$1[0m" >&2; }
|
||||
destress() { echo "[2m$1[0m" >&2; }
|
||||
highlight() { echo $2 "[4m[1m$1[0m" >&2; }
|
||||
destress() { echo $2 "[2m$1[0m" >&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)" &&
|
||||
|
|
1
packages/0ad/aur
Normal file
1
packages/0ad/aur
Normal file
|
@ -0,0 +1 @@
|
|||
|
0
packages/abra/linux
Normal file → Executable file
0
packages/abra/linux
Normal file → Executable file
1
packages/android-tools/aur
Normal file
1
packages/android-tools/aur
Normal file
|
@ -0,0 +1 @@
|
|||
|
1
packages/bc/aur
Normal file
1
packages/bc/aur
Normal file
|
@ -0,0 +1 @@
|
|||
|
1
packages/bind/apt
Normal file
1
packages/bind/apt
Normal file
|
@ -0,0 +1 @@
|
|||
dnsutils
|
1
packages/bind/arch
Normal file
1
packages/bind/arch
Normal file
|
@ -0,0 +1 @@
|
|||
bind
|
1
packages/borg/aur
Normal file
1
packages/borg/aur
Normal file
|
@ -0,0 +1 @@
|
|||
|
1
packages/caddy/apt
Normal file
1
packages/caddy/apt
Normal file
|
@ -0,0 +1 @@
|
|||
|
1
packages/caddy/aur
Normal file
1
packages/caddy/aur
Normal file
|
@ -0,0 +1 @@
|
|||
|
1
packages/clion-jre/aur
Normal file
1
packages/clion-jre/aur
Normal file
|
@ -0,0 +1 @@
|
|||
|
2
packages/clion/aur
Normal file
2
packages/clion/aur
Normal file
|
@ -0,0 +1,2 @@
|
|||
clion
|
||||
clion-jre
|
1
packages/cmake/aur
Normal file
1
packages/cmake/aur
Normal file
|
@ -0,0 +1 @@
|
|||
|
1
packages/dasht/aur
Normal file
1
packages/dasht/aur
Normal file
|
@ -0,0 +1 @@
|
|||
dasht
|
1
packages/discord/aur
Normal file
1
packages/discord/aur
Normal file
|
@ -0,0 +1 @@
|
|||
|
0
packages/elasticsearch/apt
Executable file → Normal file
0
packages/elasticsearch/apt
Executable file → Normal file
1
packages/fuseiso/aur
Normal file
1
packages/fuseiso/aur
Normal file
|
@ -0,0 +1 @@
|
|||
|
1
packages/gdb/aur
Normal file
1
packages/gdb/aur
Normal file
|
@ -0,0 +1 @@
|
|||
|
|
@ -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
|
||||
|
|
1
packages/josm/aur
Normal file
1
packages/josm/aur
Normal file
|
@ -0,0 +1 @@
|
|||
|
1
packages/kdenlive/aur
Normal file
1
packages/kdenlive/aur
Normal file
|
@ -0,0 +1 @@
|
|||
|
|
@ -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
|
||||
|
|
2
packages/latex/aur
Normal file
2
packages/latex/aur
Normal file
|
@ -0,0 +1,2 @@
|
|||
texlive-latexextra
|
||||
inkscape
|
1
packages/lemonade/aur
Normal file
1
packages/lemonade/aur
Normal file
|
@ -0,0 +1 @@
|
|||
lemonade-git
|
0
packages/logcli/binary
Executable file → Normal file
0
packages/logcli/binary
Executable file → Normal file
1
packages/logwatch/aur
Normal file
1
packages/logwatch/aur
Normal file
|
@ -0,0 +1 @@
|
|||
|
1
packages/minetest/aur
Normal file
1
packages/minetest/aur
Normal file
|
@ -0,0 +1 @@
|
|||
|
|
@ -1 +1,2 @@
|
|||
|
||||
neovim
|
||||
neovim-symlinks
|
||||
|
|
1
packages/nix-docs/aur
Normal file
1
packages/nix-docs/aur
Normal file
|
@ -0,0 +1 @@
|
|||
|
9
packages/nix/arch_post
Executable file
9
packages/nix/arch_post
Executable file
|
@ -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
|
1
packages/nmap/aur
Normal file
1
packages/nmap/aur
Normal file
|
@ -0,0 +1 @@
|
|||
|
|
@ -1 +1,2 @@
|
|||
obs-studio
|
||||
qt6-wayland
|
||||
|
|
1
packages/opendungeons/aur
Normal file
1
packages/opendungeons/aur
Normal file
|
@ -0,0 +1 @@
|
|||
|
1
packages/python-pre-commit/aur
Normal file
1
packages/python-pre-commit/aur
Normal file
|
@ -0,0 +1 @@
|
|||
|
1
packages/rdictcc-git/aur
Normal file
1
packages/rdictcc-git/aur
Normal file
|
@ -0,0 +1 @@
|
|||
|
1
packages/refind-theme-maia/aur
Normal file
1
packages/refind-theme-maia/aur
Normal file
|
@ -0,0 +1 @@
|
|||
|
1
packages/samba/aur
Normal file
1
packages/samba/aur
Normal file
|
@ -0,0 +1 @@
|
|||
|
1
packages/sauerbraten/aur
Normal file
1
packages/sauerbraten/aur
Normal file
|
@ -0,0 +1 @@
|
|||
|
1
packages/shared-mime-info/aur
Normal file
1
packages/shared-mime-info/aur
Normal file
|
@ -0,0 +1 @@
|
|||
|
1
packages/smartmontools/aur
Normal file
1
packages/smartmontools/aur
Normal file
|
@ -0,0 +1 @@
|
|||
|
1
packages/steam/aur
Normal file
1
packages/steam/aur
Normal file
|
@ -0,0 +1 @@
|
|||
|
1
packages/teeworlds/aur
Normal file
1
packages/teeworlds/aur
Normal file
|
@ -0,0 +1 @@
|
|||
|
1
packages/telegram/arch
Normal file
1
packages/telegram/arch
Normal file
|
@ -0,0 +1 @@
|
|||
telegram-desktop
|
1
packages/ttf-dejavu/aur
Normal file
1
packages/ttf-dejavu/aur
Normal file
|
@ -0,0 +1 @@
|
|||
|
1
packages/ttf-fira-code/aur
Normal file
1
packages/ttf-fira-code/aur
Normal file
|
@ -0,0 +1 @@
|
|||
|
1
packages/ttf-hack/aur
Normal file
1
packages/ttf-hack/aur
Normal file
|
@ -0,0 +1 @@
|
|||
|
2
packages/vega/npm
Normal file
2
packages/vega/npm
Normal file
|
@ -0,0 +1,2 @@
|
|||
vega
|
||||
vega-lite
|
1
packages/warzone2100/aur
Normal file
1
packages/warzone2100/aur
Normal file
|
@ -0,0 +1 @@
|
|||
|
1
packages/wifi-qr/aur
Normal file
1
packages/wifi-qr/aur
Normal file
|
@ -0,0 +1 @@
|
|||
|
10
packages/xcaddy/apt
Executable file
10
packages/xcaddy/apt
Executable file
|
@ -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
|
0
packages/xkblayout-state/binary
Executable file → Normal file
0
packages/xkblayout-state/binary
Executable file → Normal file
1
packages/zeal/aur
Normal file
1
packages/zeal/aur
Normal file
|
@ -0,0 +1 @@
|
|||
|
Loading…
Add table
Reference in a new issue