Merge pull request #75 from lrnselfreliance/release

Release

README.md

@@ -62,7 +62,7 @@ Install WROLPi onto a fresh Raspberry Pi.
 1. Install [Ubuntu Server 20.04](https://ubuntu.com/download/raspberry-pi) onto a RaspberryPi.
 2. Login to the new RaspberryPi.
 3. Get the WROLPi installation script
-    * `wget https://raw.githubusercontent.com/lrnselfreliance/wrolpi/master/install.sh -O /tmp/install.sh`
+    * `wget https://raw.githubusercontent.com/lrnselfreliance/wrolpi/release/install.sh -O /tmp/install.sh`
 4. Run the installation script
     * `sudo /bin/bash /tmp/install.sh`
 5. Start WROLPi

config/example.yaml

@@ -1,9 +1,9 @@
 # This is an example config for your WROLPi.  Do NOT modify this file, rather, copy this file to local.yaml and
 # modify that file.
-media_directory: ./test  # this should be an absolute directory, for example, /media/8TB
+media_directory: /media/wrolpi  # this should be an absolute directory, for example, /media/wrolpi
 
 downloader:
-  # Most of these names were decided by Youtube-DL project, we pass these to any calls to that project.
+  # Most of these names were decided by YT-DLP project, we pass these to any calls to that project.
   continue_dl: true
   dateafter: 19900101
   file_name_format: "%(uploader)s_%(upload_date)s_%(id)s_%(title)s.%(ext)s"
@@ -24,5 +24,3 @@ channels:
     directory: videos/wrolpi  # relative to `media_directory`
 
 timezone: America/Boise
-min_download_frequency: 14400  # 4 hours
-max_download_frequency: 43200  # 12 hours

install.sh

@@ -56,7 +56,7 @@ npm install -g 'git+https://github.com/pirate/readability-extractor'
 # Get the latest WROLPi code
 git --version
 git clone https://github.com/lrnselfreliance/wrolpi.git /opt/wrolpi || :
-(cd /opt/wrolpi && git checkout "${BRANCH}" && git pull) || exit 3
+(cd /opt/wrolpi && git fetch && git checkout "${BRANCH}" && git pull origin "${BRANCH}" --rebase) || exit 3
 
 # Setup the virtual environment that main.py expects
 pip3 --version || (
@@ -102,6 +102,9 @@ cp /opt/wrolpi/systemd/wrolpi.target /etc/systemd/system/
 /usr/bin/systemctl daemon-reload
 systemctl enable wrolpi-api.service
 systemctl enable wrolpi-app.service
+# Stop the services so the user has to start them again.  We don't want to run outdated services when updating.
+systemctl stop wrolpi-api.service
+systemctl stop wrolpi-app.service
 
 # Configure the hotspot.
 bash /opt/wrolpi/scripts/hotspot.sh
@@ -109,6 +112,10 @@ bash /opt/wrolpi/scripts/hotspot.sh
 set +x
 
 ip=$(hostname -i | cut -d' ' -f1)
+if [[ $ip == *":"* ]]; then
+  # Don't suggest the ipv6 address.
+  ip=$(hostname -i | cut -d' ' -f2)
+fi
 
 echo "