*)
# universal packages
# swh-plugins is for karaoke pulsaudio filter.
+ # mutagen for pithos
+ # lib32stdc++6/default-jdk for android studio
+ # android site says it needs a bunch of packages for ubuntu,
+ # but I googled for debian, and someone says you just need one, plus the
+ # jdk
+ # https://pid7007blog.blogspot.com/2015/07/installing-android-studio-in-debian-8.html
+ # see w.org for more android studio details
+ #
simple_packages+=(
apache2
bwm-ng
chromium
+ default-jdk
duplicity
evince
fdupes
filelight
gdb
+ gitk
goaccess
gnome-screenshot
jq
locate
+ lib32stdc++6
+ manpages
meld
nmap
offlineimap
pdfgrep
pianobar
pidgin
+ python3-mutagen
slock
squashfs-tools
swh-plugins
case $distro in
arch) pi syncthing ;;
ubuntu|debian)
- # google led me here:
- # https://apt.syncthing.net/
- curl -s https://syncthing.net/release-key.txt | sudo apt-key add -
- s="deb http://apt.syncthing.net/ syncthing release"
- if [[ $(cat /etc/apt/sources.list.d/syncthing.list) != $s ]]; then
- echo "$s" | s dd of=/etc/apt/sources.list.d/syncthing.list
- p update
+ # testing has relatively up to date packages
+ if ! isdebian-testing; then
+ # based on error when doing apt-get update:
+ # E: The method driver /usr/lib/apt/methods/https could not be found.
+ pi apt-transport-https
+ # google led me here:
+ # https://apt.syncthing.net/
+ curl -s https://syncthing.net/release-key.txt | sudo apt-key add -
+ s="deb http://apt.syncthing.net/ syncthing release"
+ if [[ $(cat /etc/apt/sources.list.d/syncthing.list) != $s ]]; then
+ echo "$s" | s dd of=/etc/apt/sources.list.d/syncthing.list
+ p update
+ fi
fi
pi syncthing
;;
# trash can versioning for sake of space on phone, with
# clean out after 7 days.
#
-# did ser syncthing@ian start
+# did:
+# ser start syncthing@ian
# then on phone, add device, hit bar code icon,
# install bar code scanner.
pi synergy
fi
-case $distro in
- # ubuntu unknown. probably the same as debian, just check if the
- # init scripts come with the package.
- debian)
- # copied from arch, but moved to etc
- s dd of=/etc/systemd/user/synergys.service <<'EOF'
-[Unit]
-Description=Synergy Server Daemon
-After=network.target
-
-[Service]
-User=%i
-ExecStart=/usr/bin/synergys --no-daemon --config /etc/synergy.conf
-Restart=on-failure
-
-[Install]
-WantedBy=multi-user.target
-EOF
- s dd of=/etc/systemd/user/synergys.socket <<'EOF'
-[Unit]
-Conflicts=synergys@.service
+# case $distro in
+# # ubuntu unknown. probably the same as debian, just check if the
+# # init scripts come with the package.
+# debian)
+# # copied from arch, but moved to etc
+# s dd of=/etc/systemd/user/synergys.service <<'EOF'
+# [Unit]
+# Description=Synergy Server Daemon
+# After=network.target
+
+# [Service]
+# User=%i
+# ExecStart=/usr/bin/synergys --no-daemon --config /etc/synergy.conf
+# Restart=on-failure
+
+# [Install]
+# WantedBy=multi-user.target
+# EOF
+# s dd of=/etc/systemd/user/synergys.socket <<'EOF'
+# [Unit]
+# Conflicts=synergys@.service
-[Socket]
-ListenStream=24800
-Accept=false
+# [Socket]
+# ListenStream=24800
+# Accept=false
-[Install]
-WantedBy=sockets.target
-EOF
- # had this fail with 'Failed to connect to bus: No such file or directory'
- # then when I tried it manually, it worked fine...
- if ! systemctl --user daemon-reload; then
- sleep 2
- echo retrying systemd user daemon reload
- systemctl --user daemon-reload
- fi
- ;;&
- *)
- # taken from arch wiki.
- s dd of=/etc/systemd/system/synergyc@.service <<'EOF'
-[Unit]
-Description=Synergy Client
-After=network.target
-
-[Service]
-User=%i
-ExecStart=/usr/bin/synergyc --no-daemon frodo
-Restart=on-failure
-# per man systemd.unit, StartLimitInterval, by default we
-# restart more than 5 times in 10 seconds.
-# And this param defaults too 200 miliseconds.
-RestartSec=3s
-
-[Install]
-WantedBy=multi-user.target
-EOF
- s systemctl daemon-reload
- case $HOSTNAME in
- x2|treetowl)
- ser enable synergyc@ian
- ser start synergyc@ian ||: # X might not be running yet
- ;;
- frodo)
- systemctl --user start synergys ||:
- systemctl --user enable synergys
- ;;
- esac
- ;;
-esac
+# [Install]
+# WantedBy=sockets.target
+# EOF
+# # had this fail with 'Failed to connect to bus: No such file or directory'
+# # then when I tried it manually, it worked fine...
+# if ! systemctl --user daemon-reload; then
+# sleep 2
+# echo retrying systemd user daemon reload
+# systemctl --user daemon-reload
+# fi
+# ;;&
+# *)
+# # taken from arch wiki.
+# s dd of=/etc/systemd/system/synergyc@.service <<'EOF'
+# [Unit]
+# Description=Synergy Client
+# After=network.target
+
+# [Service]
+# User=%i
+# ExecStart=/usr/bin/synergyc --no-daemon frodo
+# Restart=on-failure
+# # per man systemd.unit, StartLimitInterval, by default we
+# # restart more than 5 times in 10 seconds.
+# # And this param defaults too 200 miliseconds.
+# RestartSec=3s
+
+# [Install]
+# WantedBy=multi-user.target
+# EOF
+# s systemctl daemon-reload
+# case $HOSTNAME in
+# x2|treetowl)
+# ser enable synergyc@ian
+# ser start synergyc@ian ||: # X might not be running yet
+# ;;
+# frodo)
+# systemctl --user start synergys ||:
+# systemctl --user enable synergys
+# ;;
+# esac
+# ;;
+# esac
######### end misc packages #########
;;
esac
-# not using it atm, and for jessie, it depends on a higher version of btrfs-tools
+# note, for jessie, it depends on a higher version of btrfs-tools
# case $distro in
# arch|debian|ubuntu) pi btrbk ;;
# # others unknown
# esac
+cd /a/opt/btrbk
+s make install
if [[ $HOSTNAME == treetowl ]] && [[ `debian-archive` != testing ]]; then
# fail2 ban is broken, with a workaround, per
tu /etc/hosts <<< "127.0.1.1 $(hostname).lan $(hostname)"
-
-rootdev=$(mount | sed -rn 's#^(\S+) on / .*#\1#p')
-s mkdir /mnt/root
-tu /etc/fstab <<< "$rootdev /mnt/root btrfs noatime,subvolid=0 0 0"
-mountpoint /mnt/root || s mount /mnt/root
-idev=$(mount | sed -rn 's#^(\S+) on /i .*#\1#p')
-if [[ $idev != $rootdev ]]; then
- s mkdir /mnt/iroot
- tu /etc/fstab <<< "$idev /mnt/iroot btrfs noatime,subvolid=0 0 0"
- mountpoint /mnt/iroot || s mount /mnt/iroot
-fi
-
-
######### begin stuff belonging at the end ##########
iankelling.org / git / distro-setup / blobdiff