From 188d0b8ba0509ac5719e047f51f7a28d07ade742 Mon Sep 17 00:00:00 2001 From: Fabio Lenherr / DashieTM Date: Wed, 4 Oct 2023 08:38:15 +0200 Subject: [PATCH] fix: pac update --- scripts/flatpkg.txt | 25 ------------------------- scripts/pac | 27 ++++++++++++++++++++++++--- scripts/pacmanpkg.txt | 17 ++++++++++------- 3 files changed, 34 insertions(+), 35 deletions(-) diff --git a/scripts/flatpkg.txt b/scripts/flatpkg.txt index 820082c..9770c07 100644 --- a/scripts/flatpkg.txt +++ b/scripts/flatpkg.txt @@ -1,14 +1,6 @@ -app.moosync.moosync ar.xjuan.Cambalache -Editor -chat.revolt.RevoltDesktop -chat.schildi.desktop Browser -com.feaneron.Boatswain com.github.GradienceTeam.Gradience -com.github.KRTirtho.Spotube -com.github.Matoking.protontricks -com.github.babluboy.bookworm com.github.tchx84.Flatseal Games com.lakoliu.Furtherance @@ -16,20 +8,15 @@ Studio com.rustdesk.RustDesk com.usebottles.bottles com.valvesoftware.Steam.Utility.gamescope -com.vysp3r.ProtonPlus de.haeckerfelix.Fragments de.shorsh.discord-screenaudio im.fluffychat.Fluffychat -in.cinny.Cinny -info.mumble.Mumble io.github.Foldex.AdwSteamGtk io.github.lainsce.Colorway Manager io.github.spacingbat3.webcord -net.danigm.timetrack net.davidotek.pupgui2 Picker -Media Platform Platform Platform @@ -38,8 +25,6 @@ org.freedesktop.Platform.GL.default org.freedesktop.Platform.GL.default (Extra) org.freedesktop.Platform.GL.default -org.freedesktop.Platform.GL.default -(Extra) (Extra) org.freedesktop.Platform.GL32.default org.freedesktop.Platform.GL32.default @@ -49,13 +34,6 @@ org.freedesktop.Platform.ffmpeg-full org.freedesktop.Platform.ffmpeg_full.i386 org.freedesktop.Platform.openh264 org.freedesktop.Platform.openh264 -org.freedesktop.Platform.openh264 -org.gnome.Fractal.Devel -Network -Safe -Application -Application -Application Application Application Application @@ -63,15 +41,12 @@ org.gnome.Platform.Compat.i386 Software Software Library -org.godotengine.Godot Gtk theme theme Application Application Application -Desktop org.winehq.Wine.DLLs.dxvk org.winehq.Wine.gecko org.winehq.Wine.mono -re.sonny.Workbench diff --git a/scripts/pac b/scripts/pac index 208064d..9b2aba2 100755 --- a/scripts/pac +++ b/scripts/pac @@ -47,19 +47,40 @@ install() { } remove() { - PKG=$(pacman -Qs "$2") + PKG=$(pacman -Qs "$1") if [ "$PKG" == '' ]; then - flatpak uninstall "$PKG" + flatpak uninstall "$1" else - sudo pacman -R "$PKG" + sudo pacman -R "$1" fi save } +update() { + CHOICE="Y" + read -p "Update pacman? [Y/n] " CHOICE + if [ "$CHOICE" == 'Y' ] || [ "$CHOICE" == 'y' ]; then + sudo pacman -Suy + fi + CHOICE="Y" + read -p "Update flatpak? [Y/n] " CHOICE + if [ "$CHOICE" == 'Y' ] || [ "$CHOICE" == 'y' ]; then + flatpak update + fi + CHOICE="Y" + read -p "Update AUR? [Y/n] " CHOICE + if [ "$CHOICE" == 'Y' ] || [ "$CHOICE" == 'y' ]; then + sudo paru -Suy + fi + CHOICE="Y" +} + if [ "$1" == "-S" ]; then install "$2" elif [ "$1" == "-R" ]; then remove "$2" +elif [ "$1" == "-Suy" ]; then + update elif [ "$1" == "save" ]; then save elif [ "$1" == "load" ]; then diff --git a/scripts/pacmanpkg.txt b/scripts/pacmanpkg.txt index 6f9027d..629d672 100644 --- a/scripts/pacmanpkg.txt +++ b/scripts/pacmanpkg.txt @@ -215,7 +215,6 @@ electron25 element-desktop-nightly-bin element-web elfutils -emacs embree embree3 enchant @@ -1315,12 +1314,6 @@ lpsolve lsb-release lsd lsof -lsp-plugins -lsp-plugins-clap -lsp-plugins-ladspa -lsp-plugins-lv2 -lsp-plugins-standalone -lsp-plugins-vst lua lua-lpeg lua51 @@ -1643,6 +1636,8 @@ python-annotated-types python-anytree python-appdirs python-argcomplete +python-argon2-cffi-bindings +python-argon2_cffi python-attrs python-autocommand python-babel @@ -1657,11 +1652,13 @@ python-click python-cmake-build-extension python-colorama python-configobj +python-construct python-coverage python-cryptography python-cssselect python-dacite python-dateutil +python-decorator python-distlib python-distro python-docopt @@ -1672,6 +1669,7 @@ python-evdev python-fastbencode python-fastjsonschema python-filelock +python-future python-gitdb python-gitpython python-gobject @@ -1712,12 +1710,15 @@ python-platformdirs python-ply python-psutil python-pycparser +python-pycryptodomex python-pycups python-pycurl python-pydantic python-pydantic-core python-pygments +python-pykeepass python-pynacl +python-pyotp python-pyparsing python-pyrsistent python-pyserial @@ -1750,12 +1751,14 @@ python-typing_extensions python-urllib3 python-userpath python-validate-pyproject +python-validators python-virtualenv python-virtualenv-clone python-wheel python-xlib python-yaml python-zstandard +python-zxcvbn qca-qt5 qemu-audio-alsa qemu-audio-dbus