Draft: M17 support #49
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
nolith
commented
Dec 19, 2021
There was a problem hiding this comment.
I opened this PR as support for AndyTaylorTweet/Pi-Star_DV_Dash#140
It should not contain the patching scripts once ready to merge.
| ipVar=`hostname -I | cut -d' ' -f1` | ||
|
|
||
| case "$1" in | ||
| install) |
There was a problem hiding this comment.
This section of the script can be removed once this is part of a regular pirstar-upgrade process
| @@ -13,7 +13,7 @@ mount -o remount,rw / | |||
| /usr/local/sbin/HostFilesUpdate.sh | |||
|
|
|||
| # Update the Dashboard from GIT | |||
| git --work-tree=/var/www/dashboard --git-dir=/var/www/dashboard/.git pull origin master | |||
| git --work-tree=/var/www/dashboard --git-dir=/var/www/dashboard/.git pull nolith M17 | |||
| @@ -37,10 +38,10 @@ systemctl stop dmrgateway.service > /dev/null 2>&1 | |||
| systemctl stop timeserver.service > /dev/null 2>&1 | |||
|
|
|||
| # Update the Binaries | |||
| git --work-tree=/usr/local/bin --git-dir=/usr/local/bin/.git pull origin master | |||
| git --work-tree=/usr/local/bin --git-dir=/usr/local/bin/.git pull nolith M17 | |||
|
|
||
| # Update the Binaries (sbin) | ||
| git --work-tree=/usr/local/sbin --git-dir=/usr/local/sbin/.git pull origin master | ||
| git --work-tree=/usr/local/sbin --git-dir=/usr/local/sbin/.git pull nolith M17 |
| # # | ||
| ############################################################################## | ||
| # Install with | ||
| # curl https://raw.githubusercontent.com/nolith/Pi-Star_Binaries_sbin/M17/pistar-install-m17 | sudo bash - |
| @@ -0,0 +1,46 @@ | |||
| #!/bin/bash | |||
Comment on lines
+24
to
+25
| gitRemote="nolith" | ||
| gitBranch="M17" |
There was a problem hiding this comment.
This makes things easier when experimenting with a pistar branch, but it must go back to origin/master before the merge.
Suggested change
| gitRemote="nolith" | |
| gitBranch="M17" | |
| gitRemote="origin" | |
| gitBranch="master" |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This goes in pair with AndyTaylorTweet/Pi-Star_DV_Dash#140