X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=distro-end;h=9f06366c8f3a1b0efde3830d45ea2d2484a74df4;hb=15f043c2c297176bd623d8a8602e2dc5d67eacd6;hp=96fd07b58c83b9a4b2785d90776e14685295561b;hpb=dd2ab37728aeaf8b887d128c50601fb5d9bd8841;p=distro-setup

diff --git a/distro-end b/distro-end
index 96fd07b..9f06366 100755
--- a/distro-end
+++ b/distro-end
@@ -13,249 +13,67 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+### setup
 errcatch
+src="${BASH_SOURCE%/*}"
+source $src/pkgs
 
 set -x
-
 exec &> >(sudo tee -a /var/log/distro-end)
 echo "$0: $(date): starting now)"
-
-src="${BASH_SOURCE%/*}"
-
 # see example of usage to understand.
 end_msg() {
     local y
     IFS= read -r -d '' y  ||:
     end_msg_var+="$y"
 }
-
 spa() { # simple package add
     simple_packages+=($@)
 }
-
 distro=$(distro-name)
-
 pending_reboot=false
 sed="sed --follow-symlinks"
-
 # template
 case $distro in
 esac
 
+#### initial packages
 pup
-pi aptitude
-
-simple_packages=(
-    htop
-    iptables
-    mailutils
-    nmon
-    rdiff-backup
-    ruby
-    ruby-rest-client
-    tree
-    vim
-    wcd
-    wget
-)
-
-case $HOSTNAME in
-    lj|li) : ;;
-    *)
-        # universal packages
-        # swh-plugins is for karaoke pulsaudio filter.
-        # mutagen for pithos
-        # guvcview set webcam brightness to highest
-        # pidgin-otr, i went into pidgin pluggin settings and generated a key for some accounts
-        # xawtv has webcam cli control. v4lctl bright 80%; v4lctl list
-        # guvcview also adjusts webcam
-        simple_packages+=(
-            adb
-            apache2
-            apache2-doc
-            apt-doc
-            apt-listchanges
-            aptitude-doc-en
-            bash-doc
-            beets
-            beets-doc
-            binutils-doc
-            bind9-doc
-            bind9utils
-            bwm-ng
-            cloc
-            cpulimit
-            cron
-            debootstrap
-            debconf-doc
-            dirmngr
-            dnsutils
-            dnsmasq
-            dtrx
-            duplicity
-            eclipse
-            evince
-            fdupes
-            feh
-            filelight
-            flashrom
-            gawk-doc
-            gcc-doc
-            gdb
-            gdb-doc
-            geoip-bin
-            git-doc
-            git-email
-            gitk
-            glibc-doc
-            goaccess
-            gnome-screenshot
-            guvcview
-            i3lock
-            inetutils-traceroute
-            iperf3
-            iproute2-doc
-            jq
-            kid3-qt
-            kid3-cli
-            konsole
-            libreoffice
-            linphone
-            linux-doc
-            locate
-            lshw
-            make-doc
-            manpages
-            manpages-dev
-            mb2md
-            meld
-            mps-youtube
-            mpv
-            mumble
-            nagstamon
-            ncdu
-            nginx-doc
-            nmap
-            offlineimap
-            oathtool
-            opendkim-tools
-            p7zip
-            paprefs
-            parted-doc
-            pavucontrol
-            pdfgrep
-            perl-doc
-            pianobar
-            pidgin
-            pidgin-otr
-            pry
-            python-autopep8
-            python3-doc
-            qrencode
-            reportbug
-            $(aptitude show ruby | sed -rn 's/Depends: (.*)/\1/p')-doc
-            schroot
-            sqlite3-doc
-            squashfs-tools
-            swh-plugins
-            tar-doc
-            tcpdump
-            telnet
-            transmission-remote-gtk
-            vlc
-            whois
-            wondershaper
-            xawtv
-            xbacklight
-            xprintidle
-            xscreensaver
-            xscreensaver-data-extra
-            xscreensaver-gl
-            xscreensaver-gl-extra
-        )
-        spa $(apt-cache search ruby[.0-9]+-doc| awk '{print $1}')
-        ;;
-esac
-
+if isdeb; then
+    pi aptitude
+fi
 
 ########### begin section including li ################
+pi ${p3[@]} $($src/distro-pkgs)
 
 conflink
 
 case $distro in
-    arch)
-        # ubuntu 14.04 uses b-cron,
-        # but its not maintained in arch.
-        # of the ones in the main repos, cronie is only one maintained.
-        # fcron appears abandoned software.
-        pi cronie
-        sgo cronie
-        ;;
-    *) : ;; # other distros come with cron.
+    arch) sgo cronie ;;
 esac
 
-
-
 case $distro in
-    *) pi at ;;&
     arch) sgo atd ;;
 esac
 
 
 case $distro in
-    debian|trisquel|ubuntu) pi curl;;
-    arch) : ;;
-    # fedora: unknown
-esac
-
-case $distro in
-    # tk for gitk
-    arch) spa git tk ;;
-    *) spa git ;;
-esac
-
-case $distro in
-    arch) spa the_silver_searcher ;;
-    debian|trisquel|ubuntu) spa silversearcher-ag ;;
-    # fedora unknown
-esac
-
-case $distro in
-    debian|trisquel|ubuntu) spa ntp;;
-    arch)
-        pi ntp
-        sgo ntpd
-        ;;
-    # others unknown
+    arch) sgo ntpd ;;
 esac
 
 
 # no equivalent in other distros:
 case $distro in
     debian|trisquel|ubuntu)
-        pi aptitude
         if ! dpkg -s apt-file &>/dev/null; then
             # this condition is just a speed optimization
             pi apt-file
             s apt-file update
         fi
-        # for debconf-get-selections
-        spa debconf-utils
         ;;
 esac
 
 
-case $distro in
-    arch|debian|trisquel|ubuntu)
-        spa bash-completion
-        ;;
-    # others unknown
-esac
-
-
-
-
-
 # disable motd junk.
 case $distro in
     debian)
@@ -287,14 +105,8 @@ if isdebian; then
     setup-debian-auto-update
 fi
 
-# we've got a few dependencies later on, so install them now.
-pi eatmydata; PI_PREFIX=eatmydata
-pi "${simple_packages[@]}"
-simple_packages=()
-
 
 ### begin docker install ####
-
 if isdeb; then
     # https://store.docker.com/editions/community/docker-ce-server-debian?tab=description
     pi  software-properties-common apt-transport-https
@@ -367,7 +179,6 @@ esac
 # website setup
 case $HOSTNAME in
     lj|li)
-
         case $HOSTNAME in
             lj) domain=iank.bid; exit 0 ;;
             li) domain=iankelling.org ;;
@@ -719,6 +530,7 @@ EOF
         # todo: figure out how to make playback in erc happe.n
         s useradd --create-home -d /var/lib/znc --system --shell /sbin/nologin --comment "Account to run ZNC daemon" --user-group znc || [[ $? == 9 ]] # 9 if it exists already
         chmod 700 /var/lib/znc
+        s chown -R znc:znc /var/lib/znc/config
         s dd of=/etc/systemd/system/znc.service 2>/dev/null <<'EOF'
 [Unit]
 Description=ZNC, an advanced IRC bouncer
@@ -739,29 +551,12 @@ EOF
         ;;
 esac
 
-
-# needed for checkrestart
-if isdeb; then
-    spa debian-goodies
-fi
-
-
-
 ########### end section including li/lj ###############
 
-case $distro in
-    debian) spa gnome-session-flashback ;;
-    # flidas is missing dependency gnome-panel. others unknown
-esac
+pi ${p4[@]} $(apt-cache search ruby[.0-9]+-doc| awk '{print $1}')
 
 
 
-case $distro in
-    trisquel|ubuntu|debian) spa ack-grep ;;
-    arch|fedora) spa ack ;;
-    # fedora unknown
-esac
-
 
 
 case $distro in
@@ -778,20 +573,6 @@ EOF
         ;;
 esac
 
-case $distro in
-    debian)
-        spa cpio-doc ;;
-    # not packaged in flidas. others unknown. gfdl nonfree issue
-esac
-
-
-
-
-case $distro in
-    fedora) spa unrar ;;
-    *) spa unrar-free ;;
-esac
-
 
 ### begin home vpn server setup
 
@@ -834,6 +615,7 @@ fi
 
 if [[ $HOSTNAME == tp ]]; then
 
+    ##### rss2email
     # note, see bashrc for more documentation.
     pi rss2email
     s dd of=/etc/systemd/system/rss2email.service <<'EOF'
@@ -866,6 +648,7 @@ EOF
     sgo rss2email.timer
 fi
 
+
 ######### begin  pump.io periodic backup #############
 if [[ $HOSTNAME == frodo ]]; then
     s dd of=/etc/systemd/system/pumpbackup.service <<'EOF'
@@ -893,6 +676,7 @@ EOF
 fi
 #########  end  pump.io periodic backup #############
 
+
 case $distro in
     debian|trisquel|ubuntu)
         # suggests because we want the resolvconf package. however, i install it earlier
@@ -919,9 +703,8 @@ lnf /a/opt/.AndroidStudio2.2 ~
 spa lib32stdc++6 default-jdk
 
 
+############# begin syncthing setup ###########
 if [[ $HOSTNAME == frodo ]]; then
-    ############# begin syncthing setup ###########
-
     # It\'s simpler to just worry about running it in one place for now.
     # I assume it would work to clone it\'s config to another non-phone
     # and just run it in one place instead of the normal having a
@@ -993,20 +776,11 @@ if [[ $HOSTNAME == frodo ]]; then
     # Note, the other thing i did was port forward port 22000,
     # per https://docs.syncthing.net/users/firewall.html
 
-    #############  end syncthing setup ###########
 fi
+#############  end syncthing setup ###########
 
 
 
-# no equivalent in other distros:
-case $distro in
-    debian|trisquel|ubuntu)
-        # for gui bug reporting
-        spa python-vte
-        ;;
-esac
-
-
 ####### begin misc packages ###########
 
 reset-sakura
@@ -1368,6 +1142,7 @@ EOF
 EOF
     done
 fi
+######### end transmission client setup ######
 
 # dunno why it\'s there, but get rid of it
 case $HOSTNAME in
@@ -1375,7 +1150,7 @@ case $HOSTNAME in
 esac
 
 
-# printer
+### printer setup
 case $distro in
     arch)
         pi cups ghostscript gsfonts # from arch wiki cups page
@@ -1398,66 +1173,7 @@ case $distro in
     trisquel|ubuntu|debian) pi --no-install-recommends mairix notmuch ;;
     fedora|arch) spa mairix notmuch ;;
 esac
-case $distro in
-    arch) spa nfs-utils ;;
-    trisquel|ubuntu|debian) spa nfs-client ;;
-esac
-case $distro in
-    trisquel|ubuntu|debian) spa par2 ;;
-    arch|fedora) spa par2cmdline ;;
-esac
-
-# needed for my tex resume
-case $distro in
-    trisquel|ubuntu|debian) spa texlive-full ;;
-    arch) spa texlive-most ;;
-    # fedora unknown
-esac
 
-
-case $distro in
-    # optional dep for firefox for h.264 video
-    arch) spa gst-libav ;;
-    # other distros, probably come by default
-esac
-
-case $distro in
-    fedora|trisquel|ubuntu|debian) spa gnupg-agent ;;
-    arch) : ;;
-esac
-
-
-case $distro in
-    fedora) spa pinentry-gtk ;;
-    *) : ;; # comes default or with other packages
-esac
-
-case $distro in
-    arch) spa firefox pulseaudio;;
-    trisquel) spa abrowser ;;
-    *) : ;; # comes default or with other packages, or uknown
-esac
-
-
-case $distro in
-    arch) spa ttf-dejavu;;
-    debian|trisquel|ubuntu) spa fonts-dejavu ;;
-    # others unknown
-esac
-
-
-case $distro in
-    arch) spa xorg-xev;;
-    debian|trisquel|ubuntu) spa x11-utils ;;
-    # others unknown
-esac
-
-case $distro in
-    arch) pi virt-install;;&
-    debian|trisquel|ubuntu) pi virtinst ;;&
-    *) pi virt-manager ;; # creates the libvirt group in debian at least
-    # others unknown
-esac
 # allow user to run vms, from debian handbook
 for x in iank traci; do s usermod -a -G libvirt,kvm $x; done
 # bridge networking as user fails. google lead here, but it doesn\'t work:
@@ -1471,39 +1187,17 @@ for x in iank traci; do s usermod -a -G libvirt,kvm $x; done
 # #s chown root:qemu $f # debian has somethig like qemu-libvirt. equivalent?
 # s chmod 640 $f
 
-
-case $distro in
-    arch) spa cdrkit;;
-    debian|trisquel|ubuntu) spa genisoimage;;
-    # others unknown
-esac
-
-case $distro in
-    arch) spa spice-gtk3 ;;
-    debian|trisquel|ubuntu) spa spice-client-gtk;;
-    # others unknown
-esac
-
 # general known for debian/ubuntu, not for fedora
 
 case $distro in
     debian|trisquel|ubuntu)
-        pi golang-go
         # a bit of googling, and added settings to bashrc
         go get -u github.com/mvdan/fdroidcl/cmd/fdroidcl
         ;;
-    # others unknown
 esac
 
-
 case $distro in
     arch)
-        # cdrkit for cloud-init isos
-        # dnsmasq & ebtables for nat networking in libvirt
-        # qemu for qemu-img, bind-tools for dig
-        # dmidecode just because syslog complains
-        pi unzip xorg-xmodmap dmidecode ebtables\
-           bridge-utils dnsmasq qemu bind-tools
         # otherwise we get error about accessing kvm module.
         # seems like there might be a better way, but google was a bit vague.
         s $sed -ri '/^ *user *=/d' /etc/libvirt/qemu.conf
@@ -1514,41 +1208,9 @@ case $distro in
         # guessing this is not needed
         #sgo virtlogd.service
         sgo libvirtd
-
         ;;
 esac
 
-case $distro in
-    arch) pi virtviewer ;;
-    *) : ;; # other distros have it as a dependency afaik.
-esac
-
-
-
-case $distro in
-    fedora) cabal install shellcheck ;;
-    *) spa shellcheck ;;
-    # unknown for older ubuntu
-esac
-
-
-case $distro in
-    arch|debian|trisquel|ubuntu) spa pumpa ;;
-    # others unknown. do have a buildscript:
-    # /a/bin/buildscripts/pumpa ;;
-esac
-
-
-case $distro in
-    debian) pi adb ;;
-    debian|trisquel|ubuntu) spa android-tools-adbd ;;
-    # todo: not sure this is needed anymore, or if trisqel etc works even
-    #    debian) spa android-tools-adbd/unstable ;;
-    arch) spa android-tools ;;
-    # other distros unknown
-esac
-
-
 
 case $distro in
     fedora)
@@ -1574,28 +1236,6 @@ case $distro in
 esac
 
 
-case $distro in
-    debian)
-        pi task-mate-desktop
-        # in settings, change scrolling to two-finger,
-        # because the default edge scroll doesn\'t work.
-        pu transmission-gtk
-        ;;
-    trisquel)
-        # mate-indicator-applet and beyond are msc things I noticed diffing a
-        # standard install with mine.
-        pi xorg lightdm mate-desktop-environment mate-desktop-environment-extras mate-indicator-applet anacron
-        ;;
-    # others unknown
-esac
-
-case $distro in
-    arch) spa apg  ;;
-    # already in debian
-esac
-
-
-
 
 
 # note this failed running at the beginning of this file,
@@ -1708,7 +1348,6 @@ case $distro in
         sudo usermod -a -G uucp $USER
         ;;
 esac
-lnf -T /a/opt/sketches ~/Arduino
 
 # this is for the mail command too. update-alternatives is kind of misleading
 # since at least it's main commands pretend mail does not exist.
@@ -1835,7 +1474,6 @@ esac
 # esac
 cd /a/opt/btrbk
 s make install
-spa pv # for progress bar when running interactively.
 
 # ian: temporarily disabled while hosts are in flux.
 # if [[ $HOSTNAME == tp ]]; then
@@ -1846,20 +1484,29 @@ spa pv # for progress bar when running interactively.
 # fi
 
 
+end_msg <<'EOF'
+In mate settings settings, change scrolling to two-finger,
+because the default edge scroll doesn\'t work. Originally found this in debian.
+EOF
+
+case $distro in
+    debian)
+        # remove dep that came in with desktop
+        pu transmission-gtk
+        ;;
+    esac
 
 
 case $distro in
     debian|trisquel|ubuntu) s gpasswd -a iank adm ;; #needed for reading logs
 esac
 
-# tor
+#### tor
 case $distro in
     # based on
     # https://www.torproject.org/docs/rpms.html.en
     # https://www.torproject.org/docs/debian.html.en
     # todo: figure out if the running service needs to be restarted upon updates
-
-
     # todo on fedora: setup non-dev packages
     fedora)
         s dd of=/etc/yum.repos.d/torproject.repo <<'EOF'
@@ -1957,12 +1604,7 @@ fi
 e "$end_msg_var"
 
 
-# persistent virtual machines
-case $distro in
-    debian|trisquel|ubuntu)
-        pi libosinfo-bin;
-        ;;
-esac
+
 # if I was going to create a persistent vm, i might do it like this:
 # variant=something  # from: virt-install --os-variant list
 # s virt-install --noautoconsole --graphics spice,listen=0.0.0.0 \
@@ -1974,17 +1616,6 @@ esac
 ######### begin stuff belonging at the end    ##########
 
 
-case $distro in
-    ubuntu|debian)
-        spa spacefm-gtk3 ;;
-    arch)
-        spa spacefm ;;
-esac
-
-
-pi "${simple_packages[@]}"
-
-
 if $pending_reboot; then
     echo "$0: pending reboot and then finished. doing it now."
     s reboot now