Commit graph

113 commits

Author SHA1 Message Date
Christian König
fd5b3be03f
Create meta package on the fly ... Debian
Signed-off-by: Christian König <github@yubiuser.dev>
2024-11-06 20:11:56 +01:00
Christian König
bcc3a7e35e
Show version information after an web only update
Signed-off-by: Christian König <github@yubiuser.dev>
2024-09-30 21:04:55 +02:00
DL6ER
31a8f150b2
Add checking for availability of ftl.pi-hole.net when using FTL from a custom branch. If the server is down (or the user is offline, cannot resolve the domain, etc.), we fail early and hard instead of possibly corrupting the installation
Signed-off-by: DL6ER <dl6er@dl6er.de>
2024-01-31 08:00:28 +01:00
Adam Warner
7886dc0172
adminlte->web
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-10-08 14:09:47 +01:00
Adam Warner
7cbe713873
REVISIT: Don't rely on existence of setupVars.conf
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-05-27 11:51:16 +01:00
Adam Warner
0e8f285f4f
Always assume that the web interface will be installed.
We could revist this again in future if we decide that there should still be a choice to install the interface or not

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-05-27 11:51:16 +01:00
Christian König
18d28533eb
Update local and remote versions at the same time
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-10-06 12:36:17 +02:00
Christian König
518cbd10e0
Rename also in docker files
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-07-06 22:58:14 +02:00
Christian König
7aa28e4a3a
Do a full fetch
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-01-22 22:09:15 +01:00
yubiuser
920cf6de14
Check for updates on master based on tags not commits (#4475)
* Check for updates on master based on tags not commits

Signed-off-by: Christian König <ckoenig@posteo.de>

* Fix stickler

Signed-off-by: Christian König <ckoenig@posteo.de>

* Address reviewer's comments

Signed-off-by: Christian König <ckoenig@posteo.de>

* Fix stickler again

Signed-off-by: Christian König <ckoenig@posteo.de>

* Use local git instead of relying on github

Signed-off-by: Christian König <ckoenig@posteo.de>

* Add --tags

Co-authored-by: DL6ER <DL6ER@users.noreply.github.com>

Co-authored-by: DL6ER <DL6ER@users.noreply.github.com>
2021-12-22 18:21:44 +00:00
jbzdarkid
bc8150adfa Clean up bash script formatting
Done with the help of beautysh (a python-based bash formatter)

Signed-off-by: jbzdarkid <jbzdarkid@gmail.com>
2021-11-25 14:12:09 -08:00
yubiuser
6d670991c3
Perform a check of required packages befor updating pihole (#4326)
Signed-off-by: Christian König <ckoenig@posteo.de>
2021-09-12 13:38:55 -07:00
Adam Warner
4a5f344b09
then
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2020-02-19 17:46:45 +00:00
Adam Warner
af95e8c250
force updatchecker.sh run if any of the three components are updated
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2020-02-19 17:41:53 +00:00
Adam Warner
eaf1244932
:dominik: Detect binary name before calling FTLcheckUpdate in update.sh
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2019-12-04 20:10:46 +00:00
Adam Warner
12817c09bb
(Squashed commits)
Always ensure we have the correct machine arch by storing to/reading from a file rather than depending on global variable that for some reason is not always populated...

Signed-off-by: Adam Warner <me@adamwarner.co.uk>

no need for global variable

Signed-off-by: Adam Warner <me@adamwarner.co.uk>

Use a file in the temporary FTL download directory

Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>

Local binary variable named to l_binary. Disambiguate from global binary.

Allow 'binary' to be shadowed for testing.

Use ./ftlbinary in all operations.

Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>

Revert shadow ability on binary variable.

Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>

Remove unused tests, binary variable can not be overridden.

Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>

This should work here, too

Signed-off-by: Adam Warner <me@adamwarner.co.uk>

binary name is passed through from pihole checkout

Signed-off-by: Adam Warner <me@adamwarner.co.uk>

Add comments

Signed-off-by: Adam Warner <me@adamwarner.co.uk>

OK, let's try it this way again

Signed-off-by: Adam Warner <me@adamwarner.co.uk>

we might be getting somewhere.. squash after this I think!

Signed-off-by: Adam Warner <me@adamwarner.co.uk>

This is a test to see if it fixes the aarch64 test (we are definitely squashing these commits

Signed-off-by: Adam Warner <me@adamwarner.co.uk>

fix the rest of the tests

Signed-off-by: Adam Warner <me@adamwarner.co.uk>

Remove trailing whitespace in the files we've touched here

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2019-11-15 19:49:09 +00:00
DL6ER
2e17c23333
Don't warn if user is on development as this branch is constantly updated
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-03-02 16:40:59 +01:00
DL6ER
63f3381a2b
Warn user if FTL is not on branch master
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-03-02 16:36:49 +01:00
Dan Schaper
1cd40dc9e5
Space/Tab update.sh
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2018-07-20 13:22:37 -07:00
Adam Warner
a6e4b0fea5
- Test for existence of remote non-master branch of FTL before attemtping to check for update
- Move some functions from checkout to basic-install
- provide helpful error message on downlaod not existing

Signed-off-by: Adam Warner <adamw@rner.email>
2018-05-01 23:15:26 +01:00
Adam Warner
ceaf4bc6bc
Some extra code made it's way into the dev branch. Not entirely sure how that happened... related to #2115
Signed-off-by: Adam Warner <adamw@rner.email>
2018-04-23 20:46:57 +01:00
Dan
acfc49fd41
Merge branch 'development' into Install-Web-Server 2018-04-22 09:23:11 +01:00
Adam Warner
bca23dd896
Allow passing of --check-only to update script.
Don't run installer for updating web files, it's handled by getGitFiles.
I think this works...

Signed-off-by: Adam Warner <adamw@rner.email>
2018-04-15 18:25:35 +01:00
Daniel (Fourdee)
3a483a1b20 install_web_server
+ Splits web interface and server into two variables.
+ Option to disable forced install of Lighttpd.
2018-04-15 02:08:16 +01:00
Adam Warner
631f5b4848 Change order of updatable components to match the end output
Signed-off-by: Adam Warner <adamw@rner.email>
2018-04-04 16:35:11 +01:00
Adam Warner
f37b2bc7c1
move call to get_binary_name into FTLcheckUpdate() to avoid having to run that first
Signed-off-by: Adam Warner <adamw@rner.email>
2018-04-02 23:22:06 +01:00
Adam Warner
56278c6394
Fix shellcheck complaints
Signed-off-by: Adam Warner <adamw@rner.email>
2018-04-02 22:06:36 +01:00
Adam Warner
b1d6c03190
Break out binary name funtion to it's own function
Remove duplicate code. get_binary_name is now in the install script
Add some "version" checking to ftl download when using an alt branch, uses checksum
Greatly simplify update process. Source pihole-FTL version checker from basic-install.sh
Always run install script to finalise changes.
Install script now outputs versions after an update
(This is a Squash of previous work into one commit)

Signed-off-by: Adam Warner <adamw@rner.email>
2018-04-02 21:53:32 +01:00
WaLLy3K
fdf2649f2f Clean up known remaining colour output issues (#1613)
* Print newline on error message

* Output last three lines of error if update fails

* Consistent error messages & housekeeping

* Add shellcheck directive to ignore COL_TABLE
* Quoted and braced variables for codebase consistency
* Escaped newlines correctly
* Made error messages consistent (indenting and wording)
* Removed consecutive echos

* Conditional formatting consistency

* Braced, quoted and used [[ on conditionals

* Fix specific ShellCheck issues

* Fixed issues that could be safely changed without extensive testing

* Update SELinux whiptail behaviour & more

* Colourised some strings
* Fixed multiple line string indenting
* Made output consistent with existing codebase
* Removed sequential echos
* Make SELinux whiptail use "--defaultno", and change text wording

* Add help text for hostrecord, and colourise output

* this should fix the tests...

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

* revert changes to `update_package_cache()` to prove tests

Signed-off-by: Adam Warner <adamw@rner.email>
2017-07-26 18:00:08 +01:00
DL6ER
6ce79ae1d0 Fix git commands (#1577) 2017-07-01 23:52:10 +02:00
Adam Warner
b3eb5c4f0e Colour Tweaks (#1549) 2017-07-01 22:08:17 +10:00
Dan Schaper
c29c4ceb0f
Integrate DL's update.sh fixes.
`shellcheck -x` for following files.

Do not test for included files SC1091

Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-06-25 14:39:09 -07:00
Adam Warner
536585b846 Colourise Core Output Text (#1471)
* Define colours within COL_TABLE
* Do not output colours for non-terminal instances
* Removed ":::"
* Fixed indenting & spacing
* Made output consistent throughout project
* Reworded text to fit on standard 80 char wide Terminal screen
* Made 'sudo raspi-config' warning (insufficient disk space) only show on RPi
* Make "Installation/Update Complete" the final msg
* Remove redundant messages
* Simplify update available message
* Confirm user would like to begin uninstall
* If "git pull" string says "Already up-to-date.", place [i] before it
* Colour Temp/Interface output
* Made `pihole disable 5z` invalid
* Added error fallback if invalid argument (not s/m) is detected
* Quoted "$2" for consistency
* Updated help text
* L185/286: Replaced echo with redirect
* User agents for adblock.mahakala.is/adaway.org unnecessary 
* Print newline on confirmation of repository reset
* Add output to admin-related dnsmasq restarts
* Return error message for "pihole -q"
* Imply default checkout behaviour with y/N
* Fix uninstall failing to remove pihole user
* Print checkout 'git remote show origin' STDERR on new line
* Replaced checkout "AdminLTE" wording with "Web Admin"
2017-06-21 21:49:05 +10:00
WaLLy3K
aff5ff08d5 Trim version output when update is successful (#1527) 2017-06-15 09:50:05 +02:00
DL6ER
f1146a3443
Don't update FTL when there is a core update (as this will update FTL a second time). Fixes #1516 2017-06-04 12:41:44 +02:00
Flo
7e0aa822b6 Match the Pi-hole brand (#1358)
* Update README.md

* Update index.php

* Update basic-install.sh

* Update piholeCheckout.sh

* Update update.sh

* Update CONTRIBUTING.md

* Update the Pi-hole brand tip in CONTRIBUTING.md

Use a better formulation.

* Update README.md 2
2017-04-03 17:29:57 +02:00
Mcat12
fb3e6ee35c Source setupVars before attempting to use it
Fixes #1347
2017-03-21 18:01:51 -04:00
DL6ER
66b7d04b82
Merge branch 'development' into new/FTL-binary 2017-03-01 12:42:48 +01:00
Jacob Salmela
7a1a2dec67
update license to EUPL on core files 2017-02-22 11:55:20 -06:00
DL6ER
078cc7660e
Improved updater logic 2017-02-22 11:00:45 +01:00
DL6ER
af2893d2ce
Updater implementation for FTL 2017-02-22 10:43:13 +01:00
Mcat12
a48317883d Fix indentation 2017-02-07 18:14:41 -05:00
Promofaux
4fcf8fd23f Merge in development branch - resolve conflict in update.sh 2017-02-05 19:39:02 +00:00
Promofaux
10a30344e5 No need to source setupVars, as basic-install.sh is sourced, which sources setupVars itself. Sourception. 2017-02-05 19:29:56 +00:00
Promofaux
b764d17c64 comment 2017-02-05 19:18:27 +00:00
Promofaux
ba0abdb88d wrap update logic in admin_installed bool check 2017-02-05 19:12:09 +00:00
Promofaux
1428b58dde source setupVars and only check admin repo if it is enabled 2017-02-05 19:07:04 +00:00
Mcat12
18eb8a2159 Merge pull request #1185 from pi-hole/cleanup/git_functions
Move git functions to one script
2017-01-31 19:05:53 -05:00
Dan Schaper
3d9d13222b
Use constants for leading paths. 2017-01-28 17:42:55 -08:00
Dan Schaper
745adabb05
Path to source basic-install.sh 2017-01-28 17:38:14 -08:00