From 790b1176f97205a5618af03e653f819fa03b5c93 Mon Sep 17 00:00:00 2001
From: MatMoul <matmoul@gmail.com>
Date: Mon, 7 Dec 2015 00:40:48 +0100
Subject: [PATCH] Reorder Apps

---
 install/apps/dev             | 24 -----------
 install/apps/games           | 23 -----------
 install/apps/graphic/graphic | 32 ---------------
 install/apps/gstreamer       | 39 ------------------
 install/apps/internet        | 42 -------------------
 install/apps/menu            | 39 ------------------
 install/apps/multimedia      | 35 ----------------
 install/apps/network         | 29 -------------
 install/apps/office          | 33 ---------------
 install/apps/pacmangui       | 45 --------------------
 install/apps/system          | 79 ------------------------------------
 11 files changed, 420 deletions(-)
 delete mode 100644 install/apps/dev
 delete mode 100644 install/apps/games
 delete mode 100644 install/apps/graphic/graphic
 delete mode 100644 install/apps/gstreamer
 delete mode 100644 install/apps/internet
 delete mode 100644 install/apps/menu
 delete mode 100644 install/apps/multimedia
 delete mode 100644 install/apps/network
 delete mode 100644 install/apps/office
 delete mode 100644 install/apps/pacmangui
 delete mode 100644 install/apps/system

diff --git a/install/apps/dev b/install/apps/dev
deleted file mode 100644
index d6049fd..0000000
--- a/install/apps/dev
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/bash
-. ./lib
-
-options=()
-options+=("Geany" "" off)
-options+=("WebStorm" "(AUR)" off)
-
-sel=$(whiptail --backtitle "$apptitle" --title "Dev applications :" --checklist "Choose what you want" --cancel-button "Back" 0 0 0 \
-  "${options[@]}" \
-  3>&1 1>&2 2>&3)
-if [ ! "$?" = "0" ]; then
-  exit 1
-fi
-
-for itm in $sel; do
-  case $itm in
-    '"WebStorm"') aurpkg="$aurpkg $(echo $itm | sed 's/"//g')";;
-    *) pkg="$pkg $(echo $itm | sed 's/"//g')";;
-  esac
-done
-
-instpkg "$pkg" "$aurpkg"
-
-exit 0
diff --git a/install/apps/games b/install/apps/games
deleted file mode 100644
index 54a1eda..0000000
--- a/install/apps/games
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-. ./lib
-
-options=()
-options+=("0AD" "" off)
-options+=("puzzles" "" off)
-
-sel=$(whiptail --backtitle "$apptitle" --title "Game applications :" --checklist "Choose what you want" --cancel-button "Back" 0 0 0 \
-  "${options[@]}" \
-  3>&1 1>&2 2>&3)
-if [ ! "$?" = "0" ]; then
-  exit 1
-fi
-
-for itm in $sel; do
-  case $itm in
-    *) pkg="$pkg $(echo $itm | sed 's/"//g')";;
-  esac
-done
-
-instpkg "$pkg" "$aurpkg"
-
-exit 0
diff --git a/install/apps/graphic/graphic b/install/apps/graphic/graphic
deleted file mode 100644
index 2d0ba89..0000000
--- a/install/apps/graphic/graphic
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/bash
-. ./lib
-
-options=()
-options+=("gimp" "" off)
-options+=("inkscape" "" off)
-options+=("dia" "" off)
-options+=("calligra-krita" "" off)
-
-sel=$(whiptail --backtitle "$apptitle" --title "Graphic applications :" --checklist "Choose what you want" --cancel-button "Back" 0 0 0 \
-  "${options[@]}" \
-  3>&1 1>&2 2>&3)
-if [ ! "$?" = "0" ]; then
-  exit 1
-fi
-
-for itm in $sel; do
-  case $itm in
-    #'""') aurpkg="$aurpkg $(echo $itm | sed 's/"//g')";;
-    *) pkg="$pkg $(echo $itm | sed 's/"//g')";;
-  esac
-done
-
-instpkg "$pkg" "$aurpkg"
-
-for itm in $sel; do
-  case $itm in
-    '"gimp"') choosepkg "gimp-help-";;
-  esac
-done
-
-exit 0
diff --git a/install/apps/gstreamer b/install/apps/gstreamer
deleted file mode 100644
index af9669a..0000000
--- a/install/apps/gstreamer
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-. ./lib
-
-options=()
-
-options+=("gst-plugins-base" "" on)
-options+=("gst-plugins-good" "" on)
-options+=("gst-plugins-ugly" "" on)
-options+=("gst-plugins-bad" "" off)
-options+=("gst-libav" "" on)
-#options+=("gst-plugin-libde265" "(AUR)" off)
-options+=("gstreamer0.10-base-plugins" "" on)
-options+=("gstreamer0.10-good-plugins-slim" "(AUR)" off)
-options+=("gstreamer0.10-good-plugins" "" on)
-options+=("gstreamer0.10-ugly-plugins" "" on)
-options+=("gstreamer0.10-bad-plugins" "" off)
-options+=("gstreamer0.10-ffmpeg" "" on)
-#options+=("gstreamer0.10-plugin-libde265" "(AUR)" off)
-#options+=("libde265" "(AUR)" off)
-
-sel=$(whiptail --backtitle "$apptitle" --title "Gstreamer Install" --checklist "" --cancel-button "Back" 0 0 0 \
-  "${options[@]}" \
-  3>&1 1>&2 2>&3)
-if [ ! "$?" = "0" ]; then
-  exit 1
-fi
-
-for itm in $sel; do
-  case $itm in
-    'gst-plugin-libde265' | \
-    'gstreamer0.10-good-plugins-slim' | \
-    'gstreamer0.10-plugin-libde265') aurpkg="$aurpkg $(echo $itm | sed 's/"//g')";;
-    *) pkg="$pkg $(echo $itm | sed 's/"//g')";;
-  esac
-done
-
-instpkg "$pkg" "$aurpkg"
-
-exit 0
diff --git a/install/apps/internet b/install/apps/internet
deleted file mode 100644
index f9658a3..0000000
--- a/install/apps/internet
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/bash
-. ./lib
-
-options=()
-options+=("chromium" "" on)
-options+=("chromium-pepper-flash" "(AUR)" on)
-options+=("chromium-pepper-flash-standalone" "(AUR)" off)
-options+=("firefox" "" on)
-options+=("flashplugin" "" off)
-options+=("freshplayerplugin-git" "(AUR)" on)
-options+=("freshplayerplugin" "(AUR)" off)
-options+=("tixati" "(AUR)" on)
-options+=("thunderbird" "" off)
-
-sel=$(whiptail --backtitle "$apptitle" --title "Internet applications :" --checklist "Choose what you want" --cancel-button "Back" 0 0 0 \
-  "${options[@]}" \
-  3>&1 1>&2 2>&3)
-if [ ! "$?" = "0" ]; then
-  exit 1
-fi
-
-for itm in $sel; do
-  case $itm in
-    '"chromium-pepper-flash"' | \
-    '"chromium-pepper-flash-standalone"' | \
-    '"freshplayerplugin-git"' | \
-    '"freshplayerplugin"' | \
-    '"tixati"') aurpkg="$aurpkg $(echo $itm | sed 's/"//g')";;
-    *) pkg="$pkg $(echo $itm | sed 's/"//g')";;
-  esac
-done
-
-instpkg "$pkg" "$aurpkg"
-
-for itm in $sel; do
-  case $itm in
-    '"firefox"') choosepkg "firefox-i18n-";;
-    '"thunderbird"') choosepkg "thunderbird-i18n-";;
-  esac
-done
-
-exit 0
diff --git a/install/apps/menu b/install/apps/menu
deleted file mode 100644
index 403667f..0000000
--- a/install/apps/menu
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-. ./lib
-
-options=()
-options+=("Office" "")
-options+=("Internet" "")
-options+=("GStreamer" "")
-options+=("Multimedia" "")
-options+=("Graphic" "")
-#options+=("Network" "")
-options+=("System" "")
-options+=("PacMan GUI" "")
-#options+=("Dev" "")
-#options+=("Games" "")
-
-
-defaultitem=""
-sel=$(whiptail --backtitle "$apptitle" --title "Apps Install Menu :" --menu "" --default-item "$defaultitem" --cancel-button "Back" 0 0 0 \
-  "${options[@]}" \
-  3>&1 1>&2 2>&3)
-if [ ! "$?" = "0" ]; then
-  exit 1
-fi
-sed -i "/^defaultitem=/c\defaultitem=\"$sel\"" $0
-
-case $sel in
-  "Office") script install/apps/office;;
-  "Internet") script install/apps/internet;;
-  "GStreamer") script install/apps/gstreamer;;
-  "Multimedia") script install/apps/multimedia;;
-  "Graphic") script install/apps/graphic;;
-  "Network") script install/apps/network;;
-  "System") script install/apps/system;;
-  "PacMan GUI") script install/apps/pacmangui;;
-  "Dev") script install/apps/dev;;
-  "Games") script install/apps/games;;
-esac
-
-exit 0
diff --git a/install/apps/multimedia b/install/apps/multimedia
deleted file mode 100644
index 0f3cb34..0000000
--- a/install/apps/multimedia
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-. ./lib
-
-options=()
-options+=("vlc" "Video player" off)
-options+=("smplayer" "Video player" off)
-options+=("mpv" "Recommended for smplayer" off)
-options+=("smtube" "Youtube Player" off)
-options+=("amarok" "Audio Player" off)
-options+=("guayadeque" "Audio Player" off)
-options+=("clementine" "Audio Player" off)
-options+=("mixxx" "Audio Player" off)
-options+=("gmusicbrowser" "(AUR) Audio Player" off)
-options+=("avidemux-gtk" "Video Editor" off)
-options+=("avidemux-qt" "Video Editor" off)
-options+=("simplescreenrecorder" "Screen Recorder" off)
-#options+=("lib32-simplescreenrecorder" "For simplescreenrecorder" off) #Need multilib
-
-sel=$(whiptail --backtitle "$apptitle" --title "Multimedia applications :" --checklist "Choose what you want" --cancel-button "Back" 0 0 0 \
-  "${options[@]}" \
-  3>&1 1>&2 2>&3)
-if [ ! "$?" = "0" ]; then
-  exit 1
-fi
-
-for itm in $sel; do
-  case $itm in
-    '"gmusicbrowser"') aurpkg="$aurpkg $(echo $itm | sed 's/"//g')";;
-    *) pkg="$pkg $(echo $itm | sed 's/"//g')";;
-  esac
-done
-
-instpkg "$pkg" "$aurpkg"
-
-exit 0
diff --git a/install/apps/network b/install/apps/network
deleted file mode 100644
index e14cb25..0000000
--- a/install/apps/network
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-. ./lib
-
-options=()
-options+=("remmina" "" off)
-#options+=("kdenetwork-krdc" "" off)
-#options+=("kvpnc" "" off)
-options+=("teamviewer" "(AUR)" off)
-#options+=("zenmap" "" off)
-options+=("jnetmap" "(AUR)" off)
-
-sel=$(whiptail --backtitle "$apptitle" --title "Network applications :" --checklist "Choose what you want" --cancel-button "Back" 0 0 0 \
-  "${options[@]}" \
-  3>&1 1>&2 2>&3)
-if [ ! "$?" = "0" ]; then
-  exit 1
-fi
-
-for itm in $sel; do
-  case $itm in
-    '"teamviewer"' | \
-    '"jnetmap"') aurpkg="$aurpkg $(echo $itm | sed 's/"//g')";;
-    *) pkg="$pkg $(echo $itm | sed 's/"//g')";;
-  esac
-done
-
-instpkg "$pkg" "$aurpkg"
-
-exit 0
diff --git a/install/apps/office b/install/apps/office
deleted file mode 100644
index afb30f2..0000000
--- a/install/apps/office
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/bash
-. ./lib
-
-options=()
-options+=("libreoffice-fresh" "" on)
-options+=("libreoffice-still" "" off)
-options+=("calcoo" "(AUR)" off)
-options+=("qalculate-gtk" "" off)
-
-sel=$(whiptail --backtitle "$apptitle" --title "Office applications :" --checklist "Choose what you want" --cancel-button "Back" 0 0 0 \
-  "${options[@]}" \
-  3>&1 1>&2 2>&3)
-if [ ! "$?" = "0" ]; then
-  exit 1
-fi
-
-for itm in $sel; do
-  case $itm in
-    '"calcoo"') aurpkg="$aurpkg $(echo $itm | sed 's/"//g')";;
-    *) pkg="$pkg $(echo $itm | sed 's/"//g')";;
-  esac
-done
-
-instpkg "$pkg" "$aurpkg"
-
-for itm in $sel; do
-  case $itm in
-    '"libreoffice-fresh"') choosepkg "libreoffice-fresh-";;
-    '"libreoffice-still"') choosepkg "libreoffice-still-";;
-  esac
-done
-
-exit 0
diff --git a/install/apps/pacmangui b/install/apps/pacmangui
deleted file mode 100644
index 6fe53e5..0000000
--- a/install/apps/pacmangui
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/bash
-. ./lib
-options=()
-options+=("octopi" "(AUR) (QT)" off)
-options+=("octopi-notifier" "(AUR) (QT)" off)
-options+=("octopi-cachecleaner" "(AUR) (QT)" off)
-options+=("octopi-repoeditor" "(AUR) (QT)" off)
-options+=("appset-qt" "(AUR) (QT)" off)
-options+=("pamac-aur" "(AUR) (GTK)" off)
-
-sel=$(whiptail --backtitle "$apptitle" --title "PacMan GUI applications :" --checklist "Recommended to choose one" --cancel-button "Back" 0 0 0 \
-  "${options[@]}" \
-  3>&1 1>&2 2>&3)
-if [ ! "$?" = "0" ]; then
-  exit 1
-fi
-
-for itm in $sel; do
-  case $itm in
-    '"octopi"' | \
-    '"octopi-notifier"' | \
-    '"octopi-cachecleaner"' | \
-    '"octopi-repoeditor"' | \
-    '"appset-qt"' | \
-    '"pamac-aur"')
-      multilib="true"
-      aurpkg="$aurpkg $(echo $itm | sed 's/"//g')"
-    ;;
-    *) pkg="$pkg $(echo $itm | sed 's/"//g')";;
-  esac
-done
-
-if [ "$multilib" = "true" ]; then
-  if ( confirm "To install wine or wine_gecko, multilib repo is requires.\nFor this, the script edit the [mulilib] part in /etc/pacman.conf and run pacman -Syu\n\nEnable multilib repo ?" ) then
-    sed -i '/\[multilib\]/s/^#//g' /etc/pacman.conf
-    sed -i '/\[multilib\]/{n;s/^#//g}' /etc/pacman.conf
-    pacman -Syu
-  else
-    exit 1
-  fi
-fi
-
-instpkg "$pkg" "$aurpkg"
-
-exit 0
diff --git a/install/apps/system b/install/apps/system
deleted file mode 100644
index 8f24d96..0000000
--- a/install/apps/system
+++ /dev/null
@@ -1,79 +0,0 @@
-#!/bin/bash
-. ./lib
-options=()
-#options+=("octopi" "(AUR) qt pacman gui" off)
-#options+=("appset-qt" "(AUR) qt pacman gui" off)
-#options+=("pamac-aur" "(AUR) gtk pacman gui" off)
-options+=("gparted" "Partitions manager" off)
-options+=("bleachbit" "profile cleaner" off)
-options+=("keepass" "Password Manager" off)
-options+=("keepassx" "Password Manager" off)
-options+=("keepassx-git" "(AUR) Password Manager" off)
-options+=("virtualbox" "" off)
-options+=("virtualbox-host-dkms" "recommended for virtualbox" off)
-#options+=("virtualbox-host-modules" "" on)
-options+=("wine" "MS Windows App Support" off)
-options+=("wine_gecko" "MS Windows App Support" off)
-options+=("wine-mono" "MS Windows App Support" off)
-options+=("zenity" "recommended for wine" off)
-options+=("winetricks" "recommended for wine" off)
-options+=("gdmap" "" off)
-options+=("k4dirstat" "(AUR)" off)
-options+=("conky" "" off)
-
-sel=$(whiptail --backtitle "$apptitle" --title "System applications :" --checklist "Choose what you want" --cancel-button "Back" 0 0 0 \
-  "${options[@]}" \
-  3>&1 1>&2 2>&3)
-if [ ! "$?" = "0" ]; then
-  exit 1
-fi
-
-for itm in $sel; do
-  case $itm in
-    '"octopi"' | \
-    '"appset-qt"' | \
-    '"pamac-aur"' | \
-    '"keepassx-git"' | \
-    '"k4dirstat"') aurpkg="$aurpkg $(echo $itm | sed 's/"//g')";;
-    '"wine"' | \
-    '"wine_gecko"')
-      multilib="true"
-      pkg="$pkg $(echo $itm | sed 's/"//g')"
-    ;;
-    '"virtualbox-host-modules"')
-      pkg="$pkg virtualbox-host-dkms"
-      pkg="$pkg virtualbox-host-modules"
-    ;;
-    *) pkg="$pkg $(echo $itm | sed 's/"//g')";;
-  esac
-done
-
-if [ "$multilib" = "true" ]; then
-  if ( confirm "To install wine or wine_gecko, multilib repo is requires.\nFor this, the script edit the [mulilib] part in /etc/pacman.conf and run pacman -Syu\n\nEnable multilib repo ?" ) then
-    sed -i '/\[multilib\]/s/^#//g' /etc/pacman.conf
-    sed -i '/\[multilib\]/{n;s/^#//g}' /etc/pacman.conf
-    pacman -Syu
-  else
-    exit 1
-  fi
-fi
-
-instpkg "$pkg" "$aurpkg"
-
-for itm in $sel; do
-  case $itm in
-    '"virtualbox-host-dkms"')
-      if ( confirm "virtualbox-host-dkms require to rebuild initcpio.\n\nRun mkinitcpio -o linux ?" ) then
-        mkinitcpio -p linux
-      fi
-      svcenable dkms
-      svcstart dkms
-      dkms autoinstall
-    ;;
-    '"virtualbox-host-modules"')
-      dkms autoinstall
-    ;;
-  esac
-done
-
-exit 0