X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=distro-end;h=5092ce74aec71089abbae1b4f52875c00fecd17b;hb=563cc41a1f3ddb95bedf595cc249f53aea6629c1;hp=6efe7bf347e92816a728bcde8520d804867380bc;hpb=9c77c557e60d21caceeef1e78e35b35ed968fca9;p=distro-setup

diff --git a/distro-end b/distro-end
index 6efe7bf..5092ce7 100755
--- a/distro-end
+++ b/distro-end
@@ -1791,7 +1791,6 @@ sudo sed -ri 's/([[:space:]]*)(\$reset)$/\1set +o noglob #$reset/' /usr/share/ba
 rm -fv /home/iank/.mpv/watch_later
 rm -rf /home/iank/.mpv
 
-
 if [[ ! -e ~/.local/bin/pip ]]; then
   tmp=$(mktemp)
   wget -O$tmp https://bootstrap.pypa.io/get-pip.py
@@ -1799,6 +1798,37 @@ if [[ ! -e ~/.local/bin/pip ]]; then
   hash -r
 fi
 
+## begin beets
+# soo, apt install beets fails due to wanting a pip package,
+# we find out why it wants this through
+# apt-cache depends --recurse --no-recommends --no-suggests --no-conflicts --no-breaks --no-replaces --no-enhances beets | less
+# python-mediafile requires tox, which requires virtualenv, which requires pip.
+# but, python-mediafile doesn't really require tox, it is specified in
+# ./usr/lib/python3/dist-packages/mediafile-0.9.0.dist-info/METADATA
+# as being required only for testing, but the debian package
+# included it anyways, due to a mistake or bad tooling or something.
+# I don't plan to use tox, so, according to https://serverfault.com/a/251091,
+# we can create and install a dummy package by:
+#
+# "equivs-control <name>, edit the file produced to provide the right
+# dependency and have a nice name, then run equivs-build <name> and
+# finally dpkg -i the resulting .deb file"
+
+mkct
+# edited from output of equivs-control tox
+cat >tox <<'EOF'
+Section: python
+Priority: optional
+Standards-Version: 3.9.2
+Package: tox
+Description: tox-dummy
+EOF
+equivs-build tox
+sudo dpkg -i tox_1.0_all.deb
+rm -rf ./tox*
+pi beets python3-discogs-client
+
+
 # notes about barrier
 # run barrier, do the gui config,
 # setup the 2 screens, using hostnames for the new screen.
@@ -2112,7 +2142,8 @@ case $HOSTNAME in
     sudo install -m 0755 -o root -g root -t /usr/bin /a/opt/bitcoin-23.0/bin/*
     sgo bitcoind
     sudo usermod -a -G bitcoin iank
-    # todo, link in wallet. see
+    sudo ln -s /q/wallets /var/lib/bitcoind
+    # note, there exists
     # /a/bin/ds/disabled/bitcoin
     ;;
 esac