X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=distro-end;h=660d556ea2363d9220ab9859c09fc3d2b4403f97;hb=b5152768e90016afe8ff2d55cc9f38d08396b0fc;hp=96fd07b58c83b9a4b2785d90776e14685295561b;hpb=eb9b839bb5a91c60cc4f6eb9d7e38ffbf73f0e90;p=distro-setup

diff --git a/distro-end b/distro-end
index 96fd07b..660d556 100755
--- a/distro-end
+++ b/distro-end
@@ -22,6 +22,8 @@ echo "$0: $(date): starting now)"
 
 src="${BASH_SOURCE%/*}"
 
+source $src/pkgs
+
 # see example of usage to understand.
 end_msg() {
     local y
@@ -43,136 +45,16 @@ case $distro in
 esac
 
 pup
-pi aptitude
-
-simple_packages=(
-    htop
-    iptables
-    mailutils
-    nmon
-    rdiff-backup
-    ruby
-    ruby-rest-client
-    tree
-    vim
-    wcd
-    wget
-)
+if isdeb; then
+    pi aptitude
+fi
+
+simple_packages=(${p3[@]})
 
 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
-        )
+        simple_packages+=(${p4[@]})
         spa $(apt-cache search ruby[.0-9]+-doc| awk '{print $1}')
         ;;
 esac
@@ -719,6 +601,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
@@ -1708,7 +1591,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.