Skip to content

Commit

Permalink
Update README and fix install script
Browse files Browse the repository at this point in the history
  • Loading branch information
UnchartedBull committed Jun 1, 2020
1 parent fa76df9 commit a34e7d0
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 4 deletions.
6 changes: 4 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
**_Note: This script will install additional OctoPrint Plugins by default. If you want to know which visit the Wiki!_**

```
wget -qO- https://github.com/UnchartedBull/OctoDash/raw/master/scripts/install.sh | bash -s -- --ptg
bash <(wget -qO- https://github.com/UnchartedBull/OctoDash/raw/master/scripts/install.sh)
```

For more options and information have a look at the [wiki](https://github.com/UnchartedBull/OctoDash/wiki/Installation).
Expand All @@ -39,6 +39,8 @@ Having issues during the installation? Please have a look at the [Troubleshootin

## Update

_deprecated, from v2.0 onwards OctoDash can be updated from within the app_

```
wget -qO- https://github.com/UnchartedBull/OctoDash/raw/master/scripts/update.sh | bash
```
Expand All @@ -50,7 +52,7 @@ For more info have a look at the [wiki](https://github.com/UnchartedBull/OctoDas
- OctoDash supports printing from your Raspberry and from the printers SD card, if configured in OctoPrint (v1.5.0 and up)
- You can let OctoDash push out and pull in the filament during a filament change, if you setup your feed length correctly (v1.5.0 and up)
- You can also use your printers filament change progress, just enable this in the settings (the printer needs to support M600)
- If you're using FilamentManager add the color (in HEX format) to the end of the name, like "Vendor black (#000000)", this color will then be shown in the filament selection menu
- If you're using FilamentManager add the color (in HEX format) to the end of the name, like "Vendor black (#000000)", this color will then be shown in the filament selection menu
- You can adjust the look of OctoDash by adjusting the `~/.config/octodash/custom-styles.css` file and adding your own CSS rules (v2.0.0 and up)
- OctoDash supports .ufp package and PrusaSlicer preview images (v1.5.0 and up)
- To get the best results, you should use a square aspect ration, like `256x256`
Expand Down
5 changes: 3 additions & 2 deletions scripts/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -669,7 +669,7 @@ text_input() {


releaseURL=$(curl -s "https://api.github.com/repos/UnchartedBull/OctoDash/releases/latest" | grep "browser_download_url.*armv7l.deb" | cut -d '"' -f 4)
dependencies="libgtk-3-0 libnotify4 libnss3 libxss1 libxtst6 xdg-utils libatspi2.0-0 libuuid1 libappindicator3-1 libsecret-1-0 gir1.2-gnomekeyring-1.0 xserver-xorg ratpoison x11-xserver-utils xinit libgtk-3-0"
dependencies="libgtk-3-0 libnotify4 libnss3 libxss1 libxtst6 xdg-utils libatspi2.0-0 libuuid1 libappindicator3-1 libsecret-1-0 gir1.2-gnomekeyring-1.0 xserver-xorg ratpoison x11-xserver-utils xinit libgtk-3-0 bc"
IFS='/' read -ra version <<< "$releaseURL"

echo "Installing OctoDash "${version[7]}
Expand All @@ -694,7 +694,7 @@ fi;

plugins=( 'Display Layer Progress (mandatory)' 'Filament Manager' 'Preheat Button' 'Enclosure' 'Print Time Genius' 'Ultimaker Format Package' 'PrusaSlicer Thumbnails' )
checkbox_input "Which plugins should I install (you can also install them via the Octoprint UI)?" plugins selected_plugins
echo "Installing Plugins: $(join selected_plugins) ..."
echo "Installing Plugins..."

if [[ " ${selected_plugins[@]} " =~ "Display Layer Progress (mandatory)" ]]; then
"$DIRECTORY"/bin/pip install -q --disable-pip-version-check "https://github.com/OllisGit/OctoPrint-DisplayLayerProgress/releases/latest/download/master.zip"
Expand Down Expand Up @@ -758,6 +758,7 @@ EOF
fi

list_input "Shall I reboot your Pi now?" yes_no reboot
echo "OctoDash has been successfully installed! :)"
if [ $reboot == 'yes' ]; then
sudo reboot
fi
2 changes: 2 additions & 0 deletions scripts/remove.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#!/bin/bash

echo "Removing OctoDash ..."
killall octodash

Expand Down
15 changes: 15 additions & 0 deletions scripts/update.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
#!/bin/bash

release=$(curl -s "https://api.github.com/repos/UnchartedBull/OctoDash/releases/latest" | grep "browser_download_url.*armv7l.deb" | cut -d '"' -f 4)

echo "Updating OctoDash"

cd ~

wget -O octodash.deb $release -q --show-progress

sudo dpkg -i octodash.deb

rm octodash.deb

echo "Done. Restart your Raspberry Pi to start the newest version!"

0 comments on commit a34e7d0

Please sign in to comment.