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

Pi-hole checkout feature #1310

Merged
merged 12 commits into from Mar 8, 2017

Conversation

Projects
None yet
2 participants
@DL6ER
Copy link
Member

commented Mar 8, 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 checked that another pull request for this purpose does not exist.
  • I have considered, and confirmed that this submission will be valuable to others.
  • I accept that this submission may not be used, and the pull request closed at the will of the maintainer.
  • I give this submission freely, and claim no ownership to its content.

How familiar are you with the codebase?: 10


Option to checkout different branches (allow only upstream branches, no local branches):

  • pihole checkout dev - Shortcut "dev" for checking out development / devel branches
  • pihole checkout master - Shortcut "master" for checking out master branches
  • pihole checkout core ABC - Check out branch ABC on Pi-hole core repo. List available branches if specified branch does not exist.
  • pihole checkout web ABC - Check out branch ABC on Pi-hole web interface repo. List available branches if specified branch does not exist.

This template was created based on the work of udemy-dl.

DL6ER added some commits Mar 8, 2017

@DL6ER DL6ER added the Enhancement label Mar 8, 2017

@DL6ER DL6ER requested review from dschaper and Mcat12 Mar 8, 2017

dschaper and others added some commits Mar 8, 2017

Source functions and variables from basic-install.sh
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
Don't need to remember `pwd` inside a function, calling function does…
…n't change directories.

Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
Source and reuse existing variables, centralize code.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
Shift off `checkout` from being passed to script from `pihole`
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
Always `exit`ed with value 1, now exits with proper value.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
Shift numbers for argument identifiers, functions are called after `s…
…hift`

Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
One more argument to shift.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
@DL6ER

This comment has been minimized.

Copy link
Member Author

commented Mar 8, 2017

Tested again on Ubuntu 14.04 and Ubuntu 16.04

@DL6ER DL6ER merged commit 2b3afbf into development Mar 8, 2017

5 checks passed

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

@DL6ER DL6ER deleted the new/piholecheckout branch Mar 8, 2017

DL6ER added a commit that referenced this pull request Mar 10, 2017

@DL6ER DL6ER referenced this pull request Mar 10, 2017

Merged

Pi-hole Core v2.13.2 #1312

@dschaper dschaper restored the new/piholecheckout branch Mar 10, 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.