a48317883d
Fix indentation
2017-02-07 18:14:41 -05:00
4fcf8fd23f
Merge in development branch - resolve conflict in update.sh
2017-02-05 19:39:02 +00:00
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
b764d17c64
comment
2017-02-05 19:18:27 +00:00
ba0abdb88d
wrap update logic in admin_installed bool check
2017-02-05 19:12:09 +00:00
1428b58dde
source setupVars and only check admin repo if it is enabled
2017-02-05 19:07:04 +00:00
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
3d9d13222b
Use constants for leading paths.
2017-01-28 17:42:55 -08:00
745adabb05
Path to source basic-install.sh
2017-01-28 17:38:14 -08:00
3861b57dc6
Start moving reused utility functions to one script.
2017-01-28 17:32:42 -08:00
99a4a80017
Spelling
2017-01-28 17:08:38 -08:00
033ba26041
Stay in repo directory until we error check
2017-01-28 20:00:02 -05:00
e3c1fcd2c6
NEW LOGIC FOR THE UPDATER
...
Compare local and remote hashes. Update is available if current remote hash is different from current local hash since we assume that local should never be newer than remote for user
2017-01-05 13:10:19 +01:00
e15548cbf5
Add --quiet to git fetch in GitCheckUpdateAvail()
2016-12-25 01:18:58 +01:00
5e28e6b9ac
Removed remaining git -C
2016-12-25 01:17:46 +01:00
3365ef7aaa
is_repo() returns values to caller, silence function.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net >
2016-12-24 11:54:04 -08:00
68c17b26dc
Bashisms
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net >
2016-12-24 11:41:42 -08:00
e647efd471
Shell script, not javascript
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net >
2016-12-24 11:24:20 -08:00
15db1ffdd5
Remove variables not needed any more
2016-12-24 15:48:43 +01:00
4632b0f797
Updated updater logic
2016-12-24 15:40:31 +01:00
65c35a5530
Use new subroutine to determine if updates are available
2016-12-24 15:32:25 +01:00
c449a1c0e0
Added GitCheckUpdateAvail()
2016-12-24 15:19:39 +01:00
b020010f0d
Removed some of the &> /dev/null
2016-12-24 15:08:30 +01:00
0276c72fe2
replace 'git -C' with long version (see #1009 )
2016-12-24 15:05:57 +01:00
2f976504e8
switch out -eq for ==
2016-11-02 20:06:21 +00:00
f7d0de53bb
Compare string to string.
2016-11-02 12:11:34 -07:00
603ec997ba
Remove testing block.
2016-11-02 12:09:33 -07:00
f7266ef4c8
Version remote check returns -1 on failure to detect curl silent failing. Update detects loss of contact to GitHub or fallthrough condition and reports to user.
2016-11-02 12:07:59 -07:00
3d43e1568c
Use explicit calls for function to self-document
2016-11-02 11:39:22 -07:00
c1a3f003e8
Rename the only utilty function left that didn't say repo
2016-11-02 11:18:13 -07:00
3f61aea7fc
Utility functions fully quiet now. Calling functions have the echos.
2016-11-02 11:09:53 -07:00
bd68db51e0
ShellCheck split local declaration and assignment.
2016-11-02 11:01:50 -07:00
b8a5ed710e
Take echos out of utility functions and move up a level.
2016-11-02 10:51:09 -07:00
34be601dd7
Test for lexicographically less than tag version.
2016-11-02 10:42:05 -07:00
1d64ad1ccd
Stash all changed files, clean directory and pull updates.
2016-11-02 10:39:27 -07:00
f2d7a3d26d
Merge branch 'feature/defensiveTweaks' of https://github.com/pi-hole/pi-hole into feature/defensiveTweaks
2016-11-02 09:48:00 -07:00
ee37c37cab
fix update output logic. version number variables should not be read only!
2016-11-02 14:29:20 +00:00
b636c1e1f8
Whitespace.
2016-11-02 07:00:43 -07:00
8b9f0487c0
Merge branch 'feature/defensiveTweaks' of https://github.com/pi-hole/pi-hole into feature/defensiveTweaks
...
# Conflicts:
# advanced/Scripts/update.sh
# automated install/basic-install.sh
2016-11-02 06:57:33 -07:00
ece1667fb0
Refactor and move some bits.
2016-11-02 06:41:51 -07:00
50bd8b4a09
Further tweaks to local repo handling
2016-11-02 13:34:57 +00:00
93d91353a1
All tabs now spaced
2016-11-02 05:49:33 -07:00
8dc9143b34
Just delete, no need to cd there first.
2016-11-02 05:45:29 -07:00
a0d9a1133c
Factoring and combining functions
2016-11-02 05:34:39 -07:00
035e4bf727
Move value checks to if calls.
2016-11-02 03:55:04 -07:00
9ec5bbd560
Actually get is_repo to return a value and have it expected.
2016-11-02 03:38:35 -07:00
34482c5ed6
Modified is_repo
2016-11-02 03:09:59 -07:00
7d414b5628
Move version messages to main function, check for repos.
2016-11-02 01:12:02 -07:00
d9528dfd09
Bash is funny with returns.
2016-11-02 00:51:38 -07:00
9c83825cb8
Merge branch 'feature/defensiveTweaks' of https://github.com/pi-hole/pi-hole into feature/defensiveTweaks
2016-11-01 22:20:32 -07:00
