Small changes to scripts, updated docs

README.md

@@ -80,6 +80,7 @@ The [input and output](other/docs/input_and_outputs.md) README is documentation
 #### [Project Structure](other/docs/technical/project_structure.md)
 #### [History](other/docs/history.md)
 #### [Google Analytics](other/docs/google_analytics.md)
+#### [Updating](other/docs/updating.md)
 
 #### Configuration
 This uses all JSON for configuring everything. The files you edit are all in one place unless you decide to move them.

other/docs/history.md

@@ -32,6 +32,7 @@ have the ability to have multiple instances uploading packets to a single databa
 * RoverPi became corrupt, but was eventually re-flashed and set up again
 * MatePi finally became corrupt. It was re-flashed, worked, then became corrupt again. (Need new SD card).
 * Google Analytics were added
+* Did a huge rebase to remove all solarthing.jar files, restructured program directory
 
 
 ### Moving from Gson to Jackson

other/docs/random_links.md

@@ -0,0 +1,4 @@
+## Random Links
+These links probably aren't useful to anyone.
+
+https://github.com/github/git-sizer - can be used to make sure this repo is healthy

other/docs/todo.md

@@ -58,7 +58,6 @@ easy displaying in Grafana
   * Looks interesting
 * [Metrictank](https://grafana.com/oss/metrictank/)
 * IntelliJ is complaining about "busy waiting". We do a lot of this. Should we change how we're doing this?
-* https://git-lfs.github.com/ - For solarthing.jar
 
 #### TODO - Additions I'm not going to work on
 These might be useful to some people. I will not implement these in the future, but pull requests are welcome!

other/docs/updating.md

@@ -0,0 +1,11 @@
+# Updating
+To update, run these commands:
+```shell script
+# NOTE: These will need sudo
+git pull
+program/download_solarthing.sh # if there's an update, this will download it
+```
+If you are running the systemd service, do this to restart:
+```shell script
+sudo systemctl restart solarthing-<program type>
+```

program/.scripts/download_if_needed.sh

@@ -2,6 +2,6 @@
 
 BASEDIR=$(dirname "$0")
 
-if ! ls "$BASEDIR/../solarthing.jar" 2>/dev/null; then
+if ! ls "$BASEDIR/../solarthing.jar" 2>/dev/null 2>&1; then
   ../download_solarthing.sh || exit 1
 fi

program/download_solarthing.sh

@@ -4,12 +4,14 @@ BASEDIR=$(dirname "$0")
 cd "$BASEDIR" || exit 1
 
 # shellcheck source=.scripts/export_version.sh
-. "$BASEDIR"/.scripts/export_version.sh || exit 1
+. .scripts/export_version.sh || exit 1
 
-if ! ls ".downloads/solarthing-$SOLARTHING_VERSION.jar" 2>/dev/null; then
+if ! ls ".downloads/solarthing-$SOLARTHING_VERSION.jar" 1>/dev/null 2>&1; then
   echo Going to download version: "$SOLARTHING_VERSION"
   mkdir ".downloads" 2>/dev/null
   (cd .downloads && wget "https://github.com/wildmountainfarms/solarthing/releases/download/v$SOLARTHING_VERSION/solarthing-$SOLARTHING_VERSION.jar") || exit 1
+else
+  echo Already downloaded
 fi
 ln -sf ".downloads/solarthing-$SOLARTHING_VERSION.jar" solarthing.jar || exit 1
 echo Using SolarThing Version: "$SOLARTHING_VERSION"

program/graphql/solarthing-graphql.sh

@@ -3,7 +3,7 @@
 BASEDIR=$(dirname "$0")
 cd "$BASEDIR" || exit 1
 
-if ! ls "solarthing-graphql.jar" 2>/dev/null; then
+if ! ls "solarthing-graphql.jar" 2>/dev/null 2>&1; then
   ../download_solarthing.sh || exit 1
 fi
 java -jar solarthing-graphql.jar --spring.config.location=config/application.properties

program/graphql_download_solarthing.sh

@@ -6,10 +6,12 @@ cd "$BASEDIR" || exit 1
 # shellcheck source=.scripts/export_version.sh
 . "$BASEDIR"/.scripts/export_version.sh || exit 1
 
-if ! ls ".downloads/solarthing-graphql-$SOLARTHING_VERSION.jar" 2>/dev/null; then
+if ! ls ".downloads/solarthing-graphql-$SOLARTHING_VERSION.jar" 2>/dev/null 2>&1; then
   echo Going to download version: "$SOLARTHING_VERSION"
   mkdir ".downloads" 2>/dev/null
   (cd .downloads && wget "https://github.com/wildmountainfarms/solarthing/releases/download/v$SOLARTHING_VERSION/solarthing-graphql-$SOLARTHING_VERSION.jar") || exit 1
+else
+  echo Already downloaded
 fi
 ln -sf "../.downloads/solarthing-graphql-$SOLARTHING_VERSION.jar" graphql/solarthing-graphql.jar || exit 1
 echo Using SolarThing Version: "$SOLARTHING_VERSION"