Commit Graph

57 Commits (545b6605bc03dacc31e3f96d20beea5065c50bfe)

Author SHA1 Message Date
Adam Warner 545b6605bc
4.3.3 (#3154)
4 years ago
DL6ER 84244b7cd5
Fix indentation in display of branches available during pihole checkout
5 years ago
Mcat12 5c4ee23795
Fix missed start_service -> restart_service call
5 years ago
Dan Schaper c5535dd9a0
Space/Tab piholeCheckout.sh
6 years ago
Adam Warner f5541860bc
Don't run the installer when doing ftl checkout, instead just run the ftl install functions
6 years ago
Adam Warner a6e4b0fea5
- Test for existence of remote non-master branch of FTL before attemtping to check for update
6 years ago
MichaIng 43f19034b9
"INSTALL_WEB" renamed to "INSTALL_WEB_INTERFACE" #2115
6 years ago
Dan acfc49fd41
Merge branch 'development' into Install-Web-Server
6 years ago
Daniel (Fourdee) 3a483a1b20 install_web_server
6 years ago
Adam Warner b1d6c03190
Break out binary name funtion to it's own function
6 years ago
Adam Warner fbab930cb1
Allow install script to install FTL instead of the checkout script. Utilises the /etc/pihole/ftlbranch file.
6 years ago
Adam Warner 76cb129d3c
don't forget `master` and `development` branches!
6 years ago
Adam Warner 246d5cd587
store checked out FTL branch in /etc/pihole/ftlbranch
6 years ago
Adam Warner d90489b31d
Include branch we're switching from
7 years ago
Adam Warner f38912a0c9
- Correctly overwrite ${INFO} boxes with ${CROSS} etc
7 years ago
Adam Warner 247d3ed729
list availible branches for FTL
7 years ago
Adam Warner 031c6428d5
Merge branch 'tweak/checkout_FTL' of https://github.com/pi-hole/pi-hole into tweak/checkout_FTL
7 years ago
Adam Warner f2e9d585f7
* Add helptext for `pihole checkout ftl`
7 years ago
WaLLy3K 8af9853b9a Fixed minor formatting issues
7 years ago
Adam Warner 783f50657b
Merge branch 'development' into tweak/checkout_FTL
7 years ago
DL6ER bb8a263d70
ShellCheck
7 years ago
DL6ER 70fd94edb3
Edit message when requested branch of FTL is not available
7 years ago
Adam Warner b3eb5c4f0e Colour Tweaks (#1549)
7 years ago
DL6ER 98afb0e998
pihole checkout ftl
7 years ago
Adam Warner 536585b846 Colourise Core Output Text (#1471)
7 years ago
DL6ER 2516a1e298 Make clear that NO is the default if the user just hits return (#1514)
7 years ago
WaLLy3K 30035ce1c2 Merge branch 'development' into tweak/help-output
7 years ago
WaLLy3K b721ed49ab Update Help Output (#1467)
7 years ago
DL6ER db1e5f10ea
Make changes according to comment in #1384
7 years ago
Adam Warner 2e398c5da4
stash changes on branch switch, else it fails if any changes have been made.
7 years ago
Flo 7e0aa822b6 Match the Pi-hole brand (#1358)
7 years ago
Dan Schaper b0ae954f1e
Only update when `update` flag is set to "true"
7 years ago
Dan Schaper a2404f104a
Just some style and linting. And a `cd` in `fetch_checkout_pull_branch`
7 years ago
DL6ER 38547ced7a
Can only diff once upstream branch is tracked
7 years ago
DL6ER 9a9d9007cd
Add missing "== true"
7 years ago
DL6ER bd2d81f691
source setupVars.conf to see if INSTALL_WEB is true or not
7 years ago
DL6ER 1b9e7fbf2e
Test if branch is locally available is not reliable because of possible ambiguities
7 years ago
DL6ER d4a49d192f
Correct variable name
7 years ago
DL6ER 8cb66544d2
Remove "\ "
7 years ago
DL6ER 140ac192aa
The web repo might actually be missing and this is n error (not installed because the user didn't want it)
7 years ago
DL6ER b961b13d60
Small bugfix
7 years ago
DL6ER febdb4a190
Use git diff to determine if code has changed (no need to run the installer if it hasn't changed at all)
7 years ago
DL6ER 1d60b62e7a
Testing alternative way of fetching/checking out of a single branch
7 years ago
Dan Schaper 41e1e4cb68
Rearrange pull logic, some optimization.
7 years ago
Dan Schaper d5b88e0df8
Get the right name for the options.
7 years ago
Dan Schaper 20fd61468d
Require branch to check out
7 years ago
Dan Schaper 0a0d25dff4
Script runs in subshell, no need to cd back to pwd.
7 years ago
DL6ER 81a1057cac
Fix something Dan has overlooked
7 years ago
DL6ER fd310c6445
Back to how we had it before, because --unshallow does not work at all
7 years ago
Dan Schaper a9b52518bf
Shift numbers for argument identifiers, functions are called after `shift`
7 years ago