Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Only download FTL if a newer version than currently installed is detected (or if no version is detected) #1600

Merged
merged 4 commits into from Jul 26, 2017

Conversation

Projects
None yet
3 participants
@PromoFaux
Copy link
Member

PromoFaux commented Jul 12, 2017

By submitting this pull request, I confirm the following (please check boxes, eg [X]) Failure to fill the template will close your PR:

Please submit all pull requests against the development branch. Failure to do so will delay or deny your request

  • I have read and understood the contributors guide.
  • I have written tests and verified that they fail without my change.
  • I have squashed any insignificant commits.
  • This change has comments for package types, values, functions, and non-obvious lines of code.
  • I am willing to help maintain this change if there are issues with it later.
  • I give this submission freely and claim no ownership. It is compatible with the EUPL 1.2 license.
  • I have Signed Off all commits. (git commit --signoff)

Please explain what you have done and wish to accomplish with this Pull Request

  1. What does this change do, exactly?
    Currently, when pihole -r is run, FTL is downloaded regardless. This PR adds in a check for the existence of FTL, and if it detects the current version is already installs, does a sanity check of the sha1 to make sure the install is correct.

  2. Please link to the relevant issues.

  3. Which documentation changes (if any) need to be made because of this PR?

Check if FTL is already installed, do not download if it is detected,…
… and the sha1sum matches the remote

This will probably break some tests. I'll work that out in a bit
Signed-off-by: Adam Warner <adamw@rner.email>

Signed-off-by: Adam Warner <adamw@rner.email>

@PromoFaux PromoFaux requested a review from DL6ER Jul 12, 2017

initial changes to tests to take into account changes to strings
Signed-off-by: Adam Warner <adamw@rner.email>

@PromoFaux PromoFaux force-pushed the tweak/OnlyDownloadFTLNew branch from 699244f to bf70c2c Jul 12, 2017

@PromoFaux

This comment has been minimized.

Copy link
Member Author

PromoFaux commented Jul 12, 2017

Tests fixed Ready for review

@PromoFaux PromoFaux requested a review from dschaper Jul 12, 2017

@PromoFaux PromoFaux changed the title [WIP] Only download FTL if a newer version than currently installed is detected (or if no version is detected) Only download FTL if a newer version than currently installed is detected (or if no version is detected) Jul 12, 2017

@PromoFaux PromoFaux added this to the v3.3 milestone Jul 19, 2017

@@ -1816,7 +1817,7 @@ FTLinstall() {
# Detect suitable FTL binary platform
FTLdetect() {
echo ""
echo -e " ${INFO} Downloading latest version of FTL..."
echo -e " ${INFO} FTL Checks..."

This comment has been minimized.

@Mcat12

Mcat12 Jul 24, 2017

Member

Checking FTL version...

PromoFaux added some commits Jul 24, 2017

Adjust wording of echos
Signed-off-by: Adam Warner <adamw@rner.email>
prevent `./automated install/basic-install.sh: line 1886: /usr/bin/pi…
…hole-FTL: No such file or directory` on new install, or if pihole-FTL is missing for whatever reason.

Signed-off-by: Adam Warner <adamw@rner.email>

@PromoFaux PromoFaux modified the milestones: v3.2, v3.3 Jul 25, 2017

@Mcat12

Mcat12 approved these changes Jul 26, 2017

Copy link
Member

Mcat12 left a comment

Tested when it was:

  • up to date
  • missing
  • corrupted

@Mcat12 Mcat12 merged commit a77136b into development Jul 26, 2017

5 checks passed

codacy/pr Good work! A positive pull request.
Details
code-review/pullapprove Approved by Mcat12, PromoFaux
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details
license/cla Contributor License Agreement is signed.
Details

@Mcat12 Mcat12 deleted the tweak/OnlyDownloadFTLNew branch Jul 26, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.