Ark74
/
os-tools
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Heavy improvements on package selections, and logic.

This commit is contained in:
Luis Guzmán 2021-05-15 17:20:54 -05:00
parent 230e062a3e
commit 7beb991905
1 changed files with 166 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

185
base-installer.sh
View File

@ -16,54 +16,88 @@ else
echo "Let's start!" echo "Let's start!"
fi fi
# Define upstream peer # Office use?
urel_orig=$(lsb_release -sc) while [[ "$OFFICE_USE" != "yes" && "$OFFICE_USE" != "no" ]]
if [ "$urel_orig" = "flidas" ]; then do
urel="xenial" read -p "> Is this planned to be for office use: (yes or no)"$'\n' -r OFFICE_USE
elif [ "$urel_orig" = "etiona" ]; then if [ "$OFFICE_USE" = "no" ]; then
urel="bionic" echo "Ok, some extra packages will be added."
elif [ "$urel_orig" = "nabia" ]; then elif [ "$OFFICE_USE" = "yes" ]; then
urel="focal" echo "Ok, we'll stick to the office related packages only."
else fi
urel="$(lsb_release -sc)" done
# External AppImages
## Nextcloud
while [[ "$NC_APPIMAGE" != "yes" && "$NC_APPIMAGE" != "no" ]]
do
read -p "> Do you want to setup Nextcloud AppImage: (yes or no)"$'\n' -r NC_APPIMAGE
if [ "$NC_APPIMAGE" = "yes" ]; then
echo "Ok, Nextcloud AppImage will be added."
elif [ "$NC_APPIMAGE" = "no" ]; then
echo "Nextcloud AppImage won't be setup."
fi
done
DIST="$(lsb_release -sc)"
rename_distro() {
if [ "$DIST" = "$1" ]; then
DIST="$2"
fi fi
}
#Trisquel distro renaming
rename_distro flidas xenial
rename_distro etiona bionic
rename_distro nabia focal
# Functions # Functions
install_bundle_packages() { install_bundle_packages() {
for i in $1 for i in $1
do do
if [ "$(dpkg-query -W -f='${Status}' $i 2>/dev/null | grep -c "ok installed")" == "1" ]; then if [ "$(dpkg-query -W -f='${Status}' $i 2>/dev/null | grep -c "ok installed")" == "1" ]; then
echo " > Package $i already installed." echo " > Package $i already installed."
else
if [ -z "$(apt-cache madison $i 2>/dev/null)" ]; then
echo " > Package $i not available on repo."
else else
echo " > Add package $i to the install list" echo " > Add package $i to the install list"
iPackages="$iPackages $i" iPackages="$iPackages $i"
fi fi
done fi
echo "$iPackages" done
if [ -z "$iPackages" ]; then echo "$iPackages"
if [ -z "$iPackages" ]; then
echo "Nothing to install..." echo "Nothing to install..."
else else
echo "Installing packages..." echo "Installing packages..."
sudo apt-get -y install $iPackages sudo apt-get -y install $iPackages
fi fi
} }
remove_bundle_packages() { remove_bundle_packages() {
for i in $1 for i in $1
do do
if [ "$(dpkg-query -W -f='${Status}' $i 2>/dev/null | grep -c "ok installed")" == "0" ]; then if [ "$(dpkg-query -W -f='${Status}' $i 2>/dev/null | grep -c "ok installed")" == "0" ]; then
echo " > Package $i is not installed." echo " > Package $i is not installed."
else else
echo " > Add package $i to the remove list" echo " > Add package $i to the remove list"
rPackages="$rPackages $i" rPackages="$rPackages $i"
fi fi
done done
echo "$rPackages" echo "$rPackages"
if [ "$(wc -w <<< $rPackages)" = "1" ]; then if [ "$(wc -w <<< $rPackages)" = "0" ]; then
echo "Nothing to remove..." echo "Nothing to remove..."
else else
echo "Removing packages..." echo "Removing packages..."
sudo apt-get -y remove $rPackages sudo apt-get -y remove $rPackages
fi fi
}
set_once() {
if [ -z "$(awk '!/^ *#/ && NF {print}' "$2"|grep $(echo $1|awk -F '=' '{print$1}'))" ]; then
echo "Setting "$1" on "$2"..."
echo "$1" | sudo tee -a "$2"
else
echo " \"$(echo $1|awk -F '=' '{print$1}')\" seems present, skipping setting this variable"
fi
} }
change_background() { change_background() {
if [ "$(lsb_release -si)" = "$1" ]; then if [ "$(lsb_release -si)" = "$1" ]; then
@ -74,6 +108,17 @@ if [ "$(lsb_release -si)" = "$1" ]; then
fi fi
fi fi
} }
if [ "$DIST" = "bionic" ] || \
[ "$DIST" = "focal" ]; then
echo "OS: $(lsb_release -sd)"
echo "Good, this is a supported platform!"
else
echo "OS: $(lsb_release -sd)"
echo "Sorry, this platform is not supported... exiting"
exit
fi
sudo apt-get update sudo apt-get update
install_bundle_packages "curl \ install_bundle_packages "curl \
net-tools \ net-tools \
@ -114,23 +159,44 @@ HB_REPO="$(apt-cache policy | \
awk '/handbrake/{print$2}' | \ awk '/handbrake/{print$2}' | \
awk -F "/" 'NR==1{print$5}')" awk -F "/" 'NR==1{print$5}')"
##Custom locale ##Custom locale
lcl="$(env | grep LANGUAGE | awk -F ':' '{print $2}')" lcl="$(env|awk -F ':' '/LANGUAGE/{print$2}')"
# == Setup == # == Setup ==
echo "Remove discouraged packages from system..."
remove_bundle_packages "celluloid \ remove_bundle_packages "celluloid \
evolution \
pidgin \ pidgin \
snapd \ snapd \
transmission-gtk \ transmission-gtk \
viewnior" viewnior"
echo "Removing unused snap bits."
if [ -d $HOME/snap ]; then
rm -rf $HOME/snap
fi
# Remove unnecesary locales # Remove unnecesary locales
if [ "$(lsb_release -si)" = "Trisquel" ]; then if [ "$(lsb_release -si)" = "Trisquel" ]; then
sudo apt-get -y remove "abrowser-locale-*[!(en|$lcl)]" \ abrowser_l10n="$(apt-cache search abrowser-locale|awk '{print$1}'|xargs)"
abrowser-locale-cs \ ab_l10n_array=( $abrowser_l10n )
abrowser-locale-de \ for a in "${ab_l10n_array[@]}"; do
abrowser-locale-he \ if [ "$(dpkg-query -W -f='${Status}' $a 2>/dev/null | grep -c "ok installed")" == "0" ]; then
abrowser-locale-nn \ echo " > Package $a is not installed.">/dev/null
abrowser-locale-zh-hans elif [ $a != abrowser-locale-$lcl ] && [ $a != abrowser-locale-en ]; then
echo " > Add package $a to the remove list"
rAbrowser="$rAbrowser $a"
else
echo "> Keeping $a..."
fi
done
if [ "$(wc -w <<< $rAbrowser)" = "0" ]; then
echo "Nothing to remove..."
else
echo "Removing abrowser locale packages..."
sudo apt-get -y remove $rAbrowser
fi
#--
sudo apt-get -y remove "icedove-locale-*[!(en|$lcl)]" sudo apt-get -y remove "icedove-locale-*[!(en|$lcl)]"
sudo apt-get -y remove "libreoffice-l10n-*[!(en|$lcl)]" sudo apt-get -y remove "libreoffice-l10n-*[!(en|$lcl)]"
fi fi
@ -144,7 +210,6 @@ fi
install_bundle_packages "apt-file \ install_bundle_packages "apt-file \
clementine \ clementine \
cheese \ cheese \
evolution \
filezilla \ filezilla \
font-manager \ font-manager \
git \ git \
@ -152,7 +217,6 @@ install_bundle_packages "apt-file \
gnome-disk-utility \ gnome-disk-utility \
gstreamer1.0-plugins-bad \ gstreamer1.0-plugins-bad \
gthumb \ gthumb \
inkscape \
kolourpaint4 \ kolourpaint4 \
mpv \ mpv \
pdfarranger \ pdfarranger \
@ -163,47 +227,51 @@ install_bundle_packages "apt-file \
unar \ unar \
vlc \ vlc \
vokoscreen" vokoscreen"
sudo apt-file update
#Devel env #Devel env
if [ "$devel-env" = "yes" ]; then if [ "$OFFICE_USE" = "no" ]; then
install_bundle_packages "audacity \ install_bundle_packages "audacity \
bmon \ bmon \
deluge \ deluge \
exfalso \ exfalso \
geany \ geany \
htop" htop \
inkscape"
sudo apt-get install -y --no-install-recommends texlive-extra-utils sudo apt-get install -y --no-install-recommends texlive-extra-utils
fi fi
sudo apt-file update
# Install custom software # Install custom software
## - libreoffice ## - libreoffice
if [ -z "$LIBO_REPO" ]; then if [ "$(lsb_release -si)" = "Ubuntu" ] && [ -z "$LIBO_REPO" ]; then
echo "Installing LibreOffice Fresh" echo "Installing LibreOffice Fresh"
sudo apt-key adv -q --keyserver keyserver.ubuntu.com --recv-keys "$gpg_libo" sudo apt-key adv -q --keyserver keyserver.ubuntu.com --recv-keys "$gpg_libo"
echo "deb http://ppa.launchpad.net/libreoffice/ppa/ubuntu ${urel} main echo "deb http://ppa.launchpad.net/libreoffice/ppa/ubuntu ${DIST} main
deb-src http://ppa.launchpad.net/libreoffice/ppa/ubuntu ${urel} main" | \ deb-src http://ppa.launchpad.net/libreoffice/ppa/ubuntu ${DIST} main" | \
sudo tee /etc/apt/sources.list.d/libo-fresh.list sudo tee /etc/apt/sources.list.d/libo-fresh.list
fi fi
sudo apt-get update -q2 sudo apt-get update -q2
rm -rf $HOME/.config/libreoffice/ rm -rf $HOME/.config/libreoffice/
sudo apt-get -yq install libreoffice sudo apt-get -yq install libreoffice
## - mpv ## - mpv
if [ -z "$MPV_REPO" ]; then if [ -z "$MPV_REPO" ]; then
echo "Installing MPV PPA" echo "Installing MPV PPA"
sudo apt-key adv -q --keyserver keyserver.ubuntu.com --recv-keys "$gpg_mpv" sudo apt-key adv -q --keyserver keyserver.ubuntu.com --recv-keys "$gpg_mpv"
echo "deb http://ppa.launchpad.net/mc3man/mpv-tests/ubuntu ${urel} main echo "deb http://ppa.launchpad.net/mc3man/mpv-tests/ubuntu ${DIST} main
deb-src http://ppa.launchpad.net/mc3man/mpv-tests/ubuntu ${urel} main" | \ deb-src http://ppa.launchpad.net/mc3man/mpv-tests/ubuntu ${DIST} main" | \
sudo tee /etc/apt/sources.list.d/mpv-ppa.list sudo tee /etc/apt/sources.list.d/mpv-ppa.list
fi fi
sudo apt-get update -q2 sudo apt-get update -q2
sudo apt-get -yq install mpv sudo apt-get -yq install mpv
# - handbreak # - handbreak
if [ "$(lsb_release -si)" = "Ubuntu" && -z "$HB_REPO" ]; then if [ "$(lsb_release -si)" = "Ubuntu" ] && [ -z "$HB_REPO" ]; then
echo "Installing Handbreak PPA" echo "Installing Handbreak PPA"
sudo apt-key adv -q --keyserver keyserver.ubuntu.com --recv-keys $gpg_hb sudo apt-key adv -q --keyserver keyserver.ubuntu.com --recv-keys "$gpg_hb"
echo "deb http://ppa.launchpad.net/stebbins/handbrake-releases/ubuntu $urel main echo "deb http://ppa.launchpad.net/stebbins/handbrake-releases/ubuntu $DIST main
deb-src http://ppa.launchpad.net/stebbins/handbrake-releases/ubuntu $urel main" | \ deb-src http://ppa.launchpad.net/stebbins/handbrake-releases/ubuntu $DIST main" | \
sudo tee /etc/apt/sources.list.d/hb-ppa.list sudo tee /etc/apt/sources.list.d/hb-ppa.list
fi fi
sudo apt-get update -q2 sudo apt-get update -q2
@ -226,9 +294,6 @@ else
fi fi
fi fi
sudo apt-get -y install libdvd-pkg
sudo dpkg-reconfigure libdvd-pkg
# Further customization # Further customization
## Hardcode Terminator ## Hardcode Terminator
if [ "$(mate-terminal -v 2>/dev/null | grep -c "terminator")" == "1" ]; then if [ "$(mate-terminal -v 2>/dev/null | grep -c "terminator")" == "1" ]; then
@ -240,38 +305,40 @@ fi
## inotify_watch 2^18 (default 8192) ## inotify_watch 2^18 (default 8192)
sudo sysctl -w fs.inotify.max_user_watches=262144 sudo sysctl -w fs.inotify.max_user_watches=262144
if [ "$(grep -c "max_user_watches=262144" /etc/sysctl.conf)" = "0" ]; then set_once "fs.inotify.max_user_watches=262144" "/etc/sysctl.conf"
echo 'fs.inotify.max_user_watches=262144' | sudo tee -a /etc/sysctl.conf
else
echo "iNotify already set."
fi
# AI binaries # AI binaries
## Nextcloud ## Nextcloud
if [ ! -f $HOME/AI/$NCAppImageBIN ];then if [ "$NC_APPIMAGE" = "yes" ]; then
if [ ! -f $HOME/AI/$NCAppImageBIN ];then
echo "Setting Nextcloud AppImage" echo "Setting Nextcloud AppImage"
mkdir ~/AI mkdir ~/AI
cd ~/AI cd ~/AI
wget -cP /tmp $NC_ASC wget -cP /tmp $NC_ASC
wget -c $NCAppImageDL wget -c $NCAppImageDL
if [ $(lsb_release -sc) = "focal" ] || \ if [ "$(lsb_release -sc)" = "focal" ] || \
[ $(lsb_release -sc) = "nabia" ]; then [ "$(lsb_release -sc)" = "nabia" ]; then
nc_fpr="$(gpg --show-keys /tmp/nextcloud.asc|awk '!/[psub]/{print$1}'|awk NF)" nc_fpr="$(gpg --show-keys /tmp/nextcloud.asc|awk '!/[psub]/{print$1}'|awk NF)"
elif [ $(lsb_release -sc) = "bionic" ] || \ elif [ "$(lsb_release -sc)" = "bionic" ] || \
[ $(lsb_release -sc) = "etiona" ]; then [ "$(lsb_release -sc)" = "etiona" ]; then
nc_fpr="$(gpg 2>/dev/null /tmp/nextcloud.asc|awk '!/[psub]/{print$1}'|awk NF)" nc_fpr="$(gpg 2>/dev/null /tmp/nextcloud.asc|awk '!/[psub]/{print$1}'|awk NF)"
fi fi
gpg --import /tmp/nextcloud.asc gpg --import /tmp/nextcloud.asc
echo -e "5\ny\n" | gpg --command-fd 0 --expert --edit-key $nc_fpr trust echo -e "5\ny\n" | gpg --command-fd 0 --expert --edit-key $nc_fpr trust
gpg --verify $NCAppImageASC $NCAppImageBIN
echo "
|------------------ Checking Nextcloud AI client GPG Signature ------------------|"
gpg --verify $NCAppImageASC $NCAppImageBIN
echo " ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|--------------------------------------------------------------------------------|
"
chmod +x $NCAppImageBIN chmod +x $NCAppImageBIN
rm /tmp/nextcloud.asc rm /tmp/nextcloud.asc
rm $NCAppImageASC rm $NCAppImageASC
else else
echo "Nextcloud AppImage seems already there, skiping..." echo "Nextcloud AppImage seems already there, skiping..."
fi
fi fi
#Change background #Change background
change_background Ubuntu /usr/share/backgrounds/ubuntu-mate-photos/sebastian-muller-52.jpg change_background Ubuntu /usr/share/backgrounds/ubuntu-mate-photos/sebastian-muller-52.jpg
change_background Trisquel /usr/share/backgrounds/belenos3.png change_background Trisquel /usr/share/backgrounds/belenos3.png