From 9ecc047565d1e3a7a7536ad0b170af8519fd7b61 Mon Sep 17 00:00:00 2001 From: MatMoul Date: Sun, 7 May 2017 15:44:41 +0200 Subject: [PATCH] Packages maintenance --- config/bash/aliases | 6 +++++- install/apps/graphic/graphic | 2 +- install/apps/internet/webbrowser | 1 - install/system/filesystem | 2 +- install/xorg/input-drivers/input-drivers | 3 +-- install/xorg/install | 2 -- lib | 19 ++++++++++--------- updates/menu | 19 ++++++++----------- 8 files changed, 26 insertions(+), 28 deletions(-) diff --git a/config/bash/aliases b/config/bash/aliases index fc739ee..1f00ea7 100644 --- a/config/bash/aliases +++ b/config/bash/aliases @@ -20,6 +20,9 @@ options+=("grep" "grep --color=auto" on) options+=("egrep" "egrep --color=auto" on) options+=("fgrep" "fgrep --color=auto" on) options+=("mkdir" "mkdir -pv" off) +if [ -f /usr/bin/yaourt ]; then + options+=("yaourt" "sudo -u aurbuilder yaourt" on) +fi sel=$(whiptail --backtitle "$apptitle" --title "Aliases in /etc/profile.d/alias.sh :" --checklist "" --cancel-button "Back" 0 0 0 \ "${options[@]}" \ @@ -51,7 +54,8 @@ for itm in $sel; do '"egrep"') echo "alias egrep='egrep --color=auto'" >> /etc/profile.d/alias.sh;; '"fgrep"') echo "alias fgrep='fgrep --color=auto'" >> /etc/profile.d/alias.sh;; '"mkdir"') echo "alias mkdir='mkdir -pv'" >> /etc/profile.d/alias.sh;; + '"yaourt"') echo "alias yaourt='sudo -u aurbuilder yaourt'" >> /etc/profile.d/alias.sh;; esac done -exit 0 \ No newline at end of file +exit 0 diff --git a/install/apps/graphic/graphic b/install/apps/graphic/graphic index 2d0ba89..3073260 100644 --- a/install/apps/graphic/graphic +++ b/install/apps/graphic/graphic @@ -5,7 +5,7 @@ options=() options+=("gimp" "" off) options+=("inkscape" "" off) options+=("dia" "" off) -options+=("calligra-krita" "" off) +options+=("krita" "" off) sel=$(whiptail --backtitle "$apptitle" --title "Graphic applications :" --checklist "Choose what you want" --cancel-button "Back" 0 0 0 \ "${options[@]}" \ diff --git a/install/apps/internet/webbrowser b/install/apps/internet/webbrowser index ee0bce1..b3bcb3d 100644 --- a/install/apps/internet/webbrowser +++ b/install/apps/internet/webbrowser @@ -13,7 +13,6 @@ options+=("opera" "" off) options+=("seamonkey" "" off) options+=("seamonkey-i18n" "(AUR)" off) options+=("midori" "" off) -options+=("midori-gtk2" "" off) options+=("qupzilla" "" off) sel=$(whiptail --backtitle "$apptitle" --title "Web Browser applications :" --checklist "Choose what you want" --cancel-button "Back" 0 0 0 \ diff --git a/install/system/filesystem b/install/system/filesystem index f4ba81c..baa1f27 100644 --- a/install/system/filesystem +++ b/install/system/filesystem @@ -22,7 +22,7 @@ options+=("hfsprogs" "" off) options+=("mtpfs" "" off) options+=("unionfs-fuse" "" off) options+=("nilfs-utils" "" off) -options+=("gnome-vfs" "" off) +options+=("gvfs" "" off) options+=("s3fs-fuse" "" off) #options+=("fuse-exfat" "" off) # Normally installed by dependencies #options+=("f2fs-tools" "" off) # Normally installed by dependencies diff --git a/install/xorg/input-drivers/input-drivers b/install/xorg/input-drivers/input-drivers index c11ba6c..2c6566c 100644 --- a/install/xorg/input-drivers/input-drivers +++ b/install/xorg/input-drivers/input-drivers @@ -6,8 +6,7 @@ options=() items=$(pacman -Ssq xf86-input) for item in $items; do case $item in - "xf86-input-keyboard") options+=("$item" "" on);; - "xf86-input-mouse") options+=("$item" "" on);; + "xf86-input-libinput") options+=("$item" "" on);; "xf86-input-synaptics") options+=("$item" "(For Most TrackPad)" off);; "xf86-input-vmmouse") options+=("$item" "(VMWare)" off);; *) options+=("$item" "" off);; diff --git a/install/xorg/install b/install/xorg/install index 9a2d785..3d74f6a 100644 --- a/install/xorg/install +++ b/install/xorg/install @@ -4,14 +4,12 @@ options=() options+=("xorg-server" "" on) options+=("xorg-xinit" "" on) -options+=("xorg-utils" "" on) items=$(pacman -Ssq xorg-) for item in $items; do case $item in "xorg-server") ;; "xorg-xinit") ;; - "xorg-utils") ;; *) if [ ! "$(echo $item | cut -d '-' -f 1)" = "xf86" ]; then options+=("$item" "" off) diff --git a/lib b/lib index 9c1bc54..4c03718 100644 --- a/lib +++ b/lib @@ -53,15 +53,16 @@ instpkg(){ sudo -u aurbuilder yaourt -S --needed $2 pressanykey else - if [ -f /usr/bin/packer ]; then - clear - echo "# sudo -u aurbuilder packer -S $2" - sudo -u aurbuilder packer -S $2 - pressanykey - else - clear - echo "To install AUR packages, you need to install yaourt or packer in updates menu !" - fi + echo "To install AUR packages, you need to install yaourt or packer in updates menu !" + #if [ -f /usr/bin/packer ]; then + # clear + # echo "# sudo -u aurbuilder packer -S $2" + # sudo -u aurbuilder packer -S $2 + # pressanykey + #else + # clear + # echo "To install AUR packages, you need to install yaourt or packer in updates menu !" + #fi fi fi } diff --git a/updates/menu b/updates/menu index e6da8c6..c78559d 100644 --- a/updates/menu +++ b/updates/menu @@ -6,13 +6,13 @@ if [ -f /usr/bin/yaourt ]; then options+=("Upgrade with yaourt" "yaourt -Syua") aurhelper=1 fi -if [ -f /usr/bin/packer ]; then - options+=("Upgrade with packer" "packer -Syu") - aurhelper=1 -fi +#if [ -f /usr/bin/packer ]; then +# options+=("Upgrade with packer" "packer -Syu") +# aurhelper=1 +#fi if [ ! "$aurhelper" = "1" ]; then options+=("Install yaourt" "") - options+=("Install packer" "") +# options+=("Install packer" "") options+=("" "") fi options+=("Upgrade" "pacman -Syu") @@ -30,23 +30,20 @@ if [ -f /var/lib/pacman/db.lck ]; then fi if [ ! -f /usr/bin/downgrade ]; then options+=("Install downgrade" "") - options+=("" "") fi if [ "$aurhelper" = "1" ]; then if [ ! -f /usr/bin/pkgstats ]; then options+=("Install pkgstats" "") - options+=("" "") fi if [ ! -f /usr/bin/aurvote ]; then options+=("Install aurvote" "") - options+=("" "") fi if [ ! -f /usr/bin/yaourt ]; then options+=("Install yaourt" "") fi - if [ ! -f /usr/bin/packer ]; then - options+=("Install packer" "") - fi + #if [ ! -f /usr/bin/packer ]; then + # options+=("Install packer" "") + #fi fi sel=$(whiptail --backtitle "$apptitle" --title "Updates Menu :" --menu "" --cancel-button "Back" 0 0 0 \