various fixes, mostly for etiona

[distro-setup] / distro-end

diff --git a/distro-end b/distro-end
index d63d315d3da01c6a275bd2d68dda08ee0fed1e8b..18edaa56b8db4e3485e37f9d327acbdf62c40343 100755 (executable)
--- a/distro-end
+++ b/distro-end
@@ -12,15 +12,14 @@ if [[ $EUID == 0 ]]; then
   exit 1
 fi
 
-errcatch-cleanup() {
+err-cleanup() {
   echo 1 >~/.local/distro-end
 }
 
 # shellcheck source=./pkgs
 source $src/pkgs
 
-exec &> >(sudo tee -a /var/log/distro-end)
-echo "$0: $(date): starting now)"
+echo "$0: $(date) starting now)"
 # see example of usage to understand.
 end_msg() {
   local y
@@ -32,9 +31,11 @@ end() {
   echo 0 >~/.local/distro-end
   if $pending_reboot; then
     echo "$0: pending reboot and then finished. doing it now."
+    echo "exiting with status 0"
     sudo reboot now
   else
     echo "$0: $(date): ending now)"
+    echo "exiting with status 0"
   fi
   exit 0
 }
@@ -104,10 +105,10 @@ esac
 
 
 ### begin certbot install ###
-if [[ $distro == debian ]]; then
+if [[ $distro == debian || $codename_compat == bionic ]]; then
   # note, need python-certbot-nginx for nginx, but it depends on nginx,
   # and I'm not installing nginx by default right now.
-  pi certbot python-certbot-apache
+  pi certbot python3-certbot-apache
 elif [[ $codename_compat == xenial ]]; then
   # not packaged in xenial or flidas
   pi software-properties-common
@@ -603,10 +604,23 @@ case $codename_compat in
     # mate doesnt have wayland support yet
     pi task-gnome-desktop
     ;;
+  bionic)
+    pi gnome-core
+    ;;
 esac
 
 
+if [[ $codename_compat == flidas ]]; then
+  # doesnt exist in newer
+  pi gnupg-doc
+fi
 
+if [[ $codename == flidas ]]; then
+  pi abrowser
+else
+  pi firefox
+  sudo ln -sf /usr/bin/firefox /usr/local/bin/abrowser
+fi
 
 # TODO: some of the X programs can be removed from pall when using wayland
 
@@ -617,9 +631,6 @@ esac
 pi ${pall[@]} $(apt-cache search ruby[.0-9]+-doc| awk '{print $1}') $(apt-cache depends gcc|grep -i suggests:| awk '{print $2}') $($src/distro-pkgs)
 
 
-sgo fsf-vpn-dns-cleanup
-
-
 # website is dead june 14 2019. back in october, but meh
 sudo rm -fv /etc/apt/sources.list.d/iridium-browser.list
 # case $distro in
@@ -864,8 +875,8 @@ fi
 
 case $codename in
   flidas)
-
-  ;;
+    :
+    ;;
 esac
 
 
@@ -1264,8 +1275,6 @@ sudo gpasswd -a $USER lpadmin # based on ubuntu wiki
 # in arch, I had to pick out the 6L driver.
 
 
-# allow user to run vms, from debian handbook
-for x in iank user2; do s usermod -a -G libvirt,kvm $x; done
 # bridge networking as user fails. google lead here, but it doesn\'t work:
 # oh well, I give up.
 # http://wiki.qemu.org/Features-Done/HelperNetworking
@@ -1284,7 +1293,8 @@ m /a/bin/buildscripts/rust
 m /a/bin/buildscripts/misc
 
 pi-nostart virtinst virt-manager
-
+# allow user to run vms, from debian handbook
+for x in iank user2; do s usermod -a -G libvirt,kvm $x; done
 
 
 pi --no-install-recommends kdeconnect
@@ -1358,6 +1368,7 @@ DEVICESCAN -a -o on -S on -n standby,q $sched \
 
 ########### misc stuff
 
+pi-nostart network-manager
 # make networkmanager use resolvconf instead of its own dnsmasq which
 # conflicts with the normal dnsmasq package.
 f=/etc/NetworkManager/NetworkManager.conf
@@ -1373,6 +1384,7 @@ fi
 # displays l and I as the same char, grrrrr.
 sudo fc-cache
 
+pi desktop-file-utils
 m /a/bin/distro-setup/mymimes