From 4a90bb86b62ebf16f91ab4f0e7dc57b89f09c7a5 Mon Sep 17 00:00:00 2001
From: Roland <roland@learningselfreliance.com>
Date: Sat, 15 Jan 2022 18:39:35 -0700
Subject: [PATCH 1/4] Removing outdated config settings.

---
 config/example.yaml | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/config/example.yaml b/config/example.yaml
index 8f68f448..64e7bb4c 100644
--- a/config/example.yaml
+++ b/config/example.yaml
@@ -2,20 +2,6 @@
 # modify that file.
 media_directory: ./test  # this should be an absolute directory, for example, /media/8TB
 
-downloader:
-  # Most of these names were decided by Youtube-DL 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"
-  format: 22/135/18/43
-  nooverwrites: true
-  quiet: false
-  writeautomaticsub: true
-  writeinfojson: true
-  writesubtitles: true
-  writethumbnail: true
-  youtube_include_dash_manifest: false
-
 channels:
   # These are channels or playlists that will be downloaded.  You can configure them in the UI, or in your local.yaml.
   wrolpi:
@@ -24,5 +10,3 @@ channels:
     directory: videos/wrolpi  # relative to `media_directory`
 
 timezone: America/Boise
-min_download_frequency: 14400  # 4 hours
-max_download_frequency: 43200  # 12 hours

From cdb3f5855bbd067d545da100ffa825f6c5255780 Mon Sep 17 00:00:00 2001
From: Roland <roland@learningselfreliance.com>
Date: Sat, 15 Jan 2022 18:59:22 -0700
Subject: [PATCH 2/4] Fetching release branch before checking it out. 
 Preferring ipv4 address over ipv6.

---
 install.sh | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/install.sh b/install.sh
index 25bf09be..c492ed58 100755
--- a/install.sh
+++ b/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 "
 

From 0a6cc62ad6fee740475143a9bd1164e094b2da01 Mon Sep 17 00:00:00 2001
From: Roland <roland@learningselfreliance.com>
Date: Sat, 15 Jan 2022 19:00:26 -0700
Subject: [PATCH 3/4] Using release branch for install.

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 8de7a256..363aedf0 100644
--- a/README.md
+++ b/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

From 97bae3e7b2d3b3c397a414ea917ca62755adb58b Mon Sep 17 00:00:00 2001
From: Roland <roland@learningselfreliance.com>
Date: Sat, 15 Jan 2022 19:13:55 -0700
Subject: [PATCH 4/4] Changing default media_directory to be more RPi friendly.

---
 config/example.yaml | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/config/example.yaml b/config/example.yaml
index 64e7bb4c..2434370f 100644
--- a/config/example.yaml
+++ b/config/example.yaml
@@ -1,6 +1,20 @@
 # 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 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"
+  format: 22/135/18/43
+  nooverwrites: true
+  quiet: false
+  writeautomaticsub: true
+  writeinfojson: true
+  writesubtitles: true
+  writethumbnail: true
+  youtube_include_dash_manifest: false
 
 channels:
   # These are channels or playlists that will be downloaded.  You can configure them in the UI, or in your local.yaml.