From 9467415b27ee1a95d144291a70c7a3d6d25b231e Mon Sep 17 00:00:00 2001
From: Kyle Robbertze <kyle@paddatrapper.com>
Date: Tue, 19 May 2020 23:10:56 +0200
Subject: [PATCH] fix mkdocs references

---
 .travis.yml             | 43 ++++++++++++++---------------------------
 Vagrantfile             |  6 ------
 docs/scripts/_jekyll.sh | 10 +++++-----
 docs/scripts/install.sh |  8 --------
 docs/scripts/serve.sh   | 10 ----------
 docs/vagrant.md         |  2 +-
 6 files changed, 21 insertions(+), 58 deletions(-)
 delete mode 100644 docs/scripts/install.sh
 delete mode 100644 docs/scripts/serve.sh

diff --git a/.travis.yml b/.travis.yml
index 48bf0b452..c3eb5766f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -77,7 +77,6 @@ install:
     if [[ "$PYTHON" == true ]]; then
       pyenv local 3.7
       pip3 install -U pip wheel
-      # pip3 install --user mkdocs
       pip3 install --user rgain3
       pushd python_apps/airtime_analyzer
       python3 setup.py install --dry-run --no-init-script
@@ -93,30 +92,18 @@ before_script:
 script:
 - ./travis/php.sh
 - ./travis/python.sh
-#deploy:
-#- provider: pages
-#  skip_cleanup: true
-#  local_dir: build/docs
-#  github_token: $GITHUB_TOKEN # Set in travis-ci.org dashboard
-#  target_branch: master
-#  repo: LibreTime/LibreTime.github.io
-#  project_name: LibreTime
-#  fqdn: libretime.org
-#  name: R. LibreTime DocBot
-#  on:
-#    branch: master
-#    condition: $PYTHON = true
-#- provider: script
-#  skip_cleanup: true
-#  script: ./travis/release.sh
-#  on:
-#    tags: true
-#    condition: $PYTHON = true
-#- provider: releases
-#  skip_cleanup: true
-#  api_key: $GITHUB_TOKEN
-#  file_glob: true
-#  file: build/libretime-*.tar.gz
-#  on:
-#    tags: true
-#    condition: $PYTHON = true
+deploy:
+- provider: script
+  skip_cleanup: true
+  script: ./travis/release.sh
+  on:
+    tags: true
+    condition: $PYTHON = true
+- provider: releases
+  skip_cleanup: true
+  api_key: $GITHUB_TOKEN
+  file_glob: true
+  file: build/libretime-*.tar.gz
+  on:
+    tags: true
+    condition: $PYTHON = true
diff --git a/Vagrantfile b/Vagrantfile
index 2f03306dd..19650274e 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -10,8 +10,6 @@ Vagrant.configure("2") do |config|
   # liquidsoap input harbors for instreaming (ie. /master)
   config.vm.network "forwarded_port", guest: 8001, host:8001
   config.vm.network "forwarded_port", guest: 8002, host:8002
-  # mkdocs documentation
-  # config.vm.network "forwarded_port", guest: 8888, host:8888
 
   # make sure we are using nfs (doesn't work out of the box with debian)
   nfsPath = "."
@@ -69,10 +67,6 @@ Vagrant.configure("2") do |config|
 
     # Provision LibreTime
     config.vm.provision "install", type: "shell", inline: "cd /vagrant; ./install %s --web-port=8080" % installer_args
-
-    # Provision docs
-    # config.vm.provision "install-mkdocs", type: "shell", path: "docs/scripts/install.sh"
-    # config.vm.provision "start-mkdocs", type: "shell", path: "docs/scripts/serve.sh"
   end
 
 end
diff --git a/docs/scripts/_jekyll.sh b/docs/scripts/_jekyll.sh
index d5a5dc860..75b0ddf00 100644
--- a/docs/scripts/_jekyll.sh
+++ b/docs/scripts/_jekyll.sh
@@ -1,12 +1,12 @@
 # Installing Jekyll
+# This script does not work and exists as a skeleton for
+# someone to use to get Jekyll building outside of GitHub
 
 echo "Installing Ruby"
 sudo apt-get install ruby-full build-essential zlib1g-dev
 
-echo '# Install Ruby Gems to ~/gems' >> ~/.bashrc
-echo 'export GEM_HOME="$HOME/gems"' >> ~/.bashrc
-echo 'export PATH="$HOME/gems/bin:$PATH"' >> ~/.bashrc
-source ~/.bashrc
+export GEM_HOME=".gems"
+export PATH=".gems/bin:$PATH"
 
 echo "Installing Jekyll"
 cd docs
@@ -15,4 +15,4 @@ gem install jekyll bundler
 # Running Jekyll
 bundle exec jekyll serve --watch --port 8888
 
-echo "Visit http://localhost:8888 to see the LibreTime website."
\ No newline at end of file
+echo "Visit http://localhost:8888 to see the LibreTime website."
diff --git a/docs/scripts/install.sh b/docs/scripts/install.sh
deleted file mode 100644
index bcb98d6ef..000000000
--- a/docs/scripts/install.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#! /bin/sh
-
-echo "Updating Apt."
-apt-get update > /dev/null
-echo "Ensuring Pip is installed."
-DEBIAN_FRONTEND=noninteractive apt-get install -y -qq python3-pip > /dev/null
-echo "Ensuring Mkdocs is installed."
-pip3 install mkdocs
\ No newline at end of file
diff --git a/docs/scripts/serve.sh b/docs/scripts/serve.sh
deleted file mode 100644
index 2596ef316..000000000
--- a/docs/scripts/serve.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#! /bin/sh
-
-cd /vagrant
-echo "Stopping any running Mkdocs servers."
-pkill mkdocs
-echo "Building Mkdocs documentation."
-mkdocs build --clean -q > /dev/null
-echo "Launching Mkdocs server."
-mkdocs serve > /dev/null 2>&1 &
-echo "Visit http://localhost:8888 to see the LibreTime documentation."
diff --git a/docs/vagrant.md b/docs/vagrant.md
index c674ac48b..513987529 100644
--- a/docs/vagrant.md
+++ b/docs/vagrant.md
@@ -113,4 +113,4 @@ If anything fails during the initial provisioning step you can try running `vagr
 to re-run the installer.
 
 If you only want to re-run parts of the installer, use `--provision-with $step`. The
-supported steps are `prepare`, `install`, `install-mkdocs` and `start-mkdocs`.
+supported steps are `prepare` and `install`.