Skip to content

Commit 54035ce

Browse files
JulianPrieberJulianPrieber
committed
Added skip backup on update option
Added skip backup on update option to config
1 parent 5b73de7 commit 54035ce

File tree

3 files changed

+26
-28
lines changed

3 files changed

+26
-28
lines changed

‎config/self-update.php‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,9 @@
22

33
declare(strict_types=1);
44

5-
$Vlocal = 'v' . file_get_contents(base_path("version.json"));
65

76
if (env('JOIN_BETA') == true) {
8-
$Vgit = file_get_contents("https://julianprieber.github.io/littlelink-custom/version.json");
9-
} else {
10-
$Vgit = '0';
11-
}
12-
13-
if ($Vgit > $Vlocal) {
14-
$userver = 'https://update.littlelink-custom.com/';
15-
} elseif (env('JOIN_BETA') == true) {
16-
$userver = 'https://update.littlelink-custom.com/beta/';
7+
$userver = 'https://beta.littlelink-custom.com/';
178
} else {
189
$userver = 'https://update.littlelink-custom.com/';
1910
}

‎resources/views/update.blade.php‎

Lines changed: 23 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,24 +4,24 @@
44
<div class="container">
55

66
<?php // Requests newest version from server and sets it as variable
7-
$Vgit = file_get_contents("https://julianprieber.github.io/littlelink-custom/version.json");
7+
$Vgit = file_get_contents("https://julianprieber.github.io/littlelink-custom/version.json");
88
99
// Requests current version from the local version file and sets it as variable
10-
$Vlocal = 'v' . file_get_contents(base_path("version.json"));
10+
$Vlocal = 'v' . file_get_contents(base_path("version.json"));
1111
?>
1212
@if(auth()->user()->role == 'admin' and $Vgit > $Vlocal or env('JOIN_BETA') === true)
1313

1414
@if($_SERVER['QUERY_STRING'] === '')
1515
<?php //landing page ?>
1616

1717
<div class="logo-container fadein">
18-
<img class="logo-img" src="{{ asset('littlelink/images/just-gear.svg') }}" alt="Logo" style="">
18+
<img class="logo-img" src="{{ asset('littlelink/images/just-gear.svg') }}" alt="Logo">
1919
<div class="logo-centered">l</div>
2020
</div>
2121
<h1>Updater</h1>
2222
@if(strtoupper(substr(PHP_OS, 0, 3)) === 'WIN')
2323
<h4 class="">The updater only works on Linux based systems.</h4>
24-
<a class="btn" href="https://littlelink-custom.com/update"><button style=""><i class="fa-solid fa-download btn"></i> Update manually</button></a>
24+
<a class="btn" href="https://littlelink-custom.com/update"><button><i class="fa-solid fa-download btn"></i> Update manually</button></a>
2525
@else
2626
@if(env('JOIN_BETA') === true)
2727
<p><?php echo "latest beta version= " . file_get_contents("https://update.littlelink-custom.com/beta/vbeta.json"); ?></p>
@@ -31,8 +31,12 @@
3131
<h4 class="">You can update your installation automatically or download the update and install it manually:</h4>
3232
@endif
3333
<br><div class="row">
34-
&ensp;<a class="btn" href="{{url()->current()}}/?backup"><button style=""><i class="fa-solid fa-user-gear btn"></i> Update automatically</button></a>&ensp;
35-
&ensp;<a class="btn" href="https://littlelink-custom.com/update"><button style=""><i class="fa-solid fa-download btn"></i> Update manually</button></a>&ensp;
34+
@if(env('SKIP_UPDATE_BACKUP') == true)
35+
&ensp;<a class="btn" href="{{url()->current()}}/?updating"><button><i class="fa-solid fa-user-gear btn"></i> Update automatically</button></a>&ensp;
36+
@else
37+
&ensp;<a class="btn" href="{{url()->current()}}/?backup"><button><i class="fa-solid fa-user-gear btn"></i> Update automatically</button></a>&ensp;
38+
@endif
39+
&ensp;<a class="btn" href="https://littlelink-custom.com/update"><button><i class="fa-solid fa-download btn"></i> Update manually</button></a>&ensp;
3640
</div>
3741
@endif
3842

@@ -44,7 +48,7 @@
4448
<meta http-equiv="refresh" content="2; URL={{url()->current()}}/?backups" />
4549
@endpush
4650
<div class="logo-container fadein">
47-
<img class="logo-img loading" src="{{ asset('littlelink/images/just-gear.svg') }}" alt="Logo" style="">
51+
<img class="logo-img loading" src="{{ asset('littlelink/images/just-gear.svg') }}" alt="Logo">
4852
<div class="logo-centered">l</div>
4953
</div>
5054
<h1 class="loadingtxt">Creating backup</h1>
@@ -60,10 +64,10 @@
6064
exit(); ?>
6165
@endif
6266

63-
@if($_SERVER['QUERY_STRING'] === 'updating' and (file_exists(base_path("backups/CANUPDATE"))))
67+
@if($_SERVER['QUERY_STRING'] === 'updating' and (file_exists(base_path("backups/CANUPDATE")) or env('SKIP_UPDATE_BACKUP') == true))
6468
<?php //updating... ?>
6569
<div class="logo-container fadein">
66-
<img class="logo-img loading" src="{{ asset('littlelink/images/just-gear.svg') }}" alt="Logo" style="">
70+
<img class="logo-img loading" src="{{ asset('littlelink/images/just-gear.svg') }}" alt="Logo">
6771
<div class="logo-centered">l</div>
6872
</div>
6973
<h1 class="loadingtxt">Updating</h1>
@@ -76,21 +80,21 @@
7680
<?php //success ?>
7781

7882
<div class="logo-container fadein">
79-
<img class="logo-img" src="{{ asset('littlelink/images/just-gear.svg') }}" alt="Logo" style="">
83+
<img class="logo-img" src="{{ asset('littlelink/images/just-gear.svg') }}" alt="Logo">
8084
<div class="logo-centered">l</div>
8185
</div>
8286
<h1>No new version</h1>
8387
<h4 class="">There is no new version available</h4>
8488
<br><div class="row">
85-
&ensp;<a class="btn" href="{{ route('studioIndex') }}"><button style=""><i class="fa-solid fa-house-laptop btn"></i> Admin Panel</button></a>&ensp;
89+
&ensp;<a class="btn" href="{{ route('studioIndex') }}"><button><i class="fa-solid fa-house-laptop btn"></i> Admin Panel</button></a>&ensp;
8690
</div>
8791

8892
@endif
8993

9094
@if($_SERVER['QUERY_STRING'] === 'finishing')
9195
<?php //updating... ?>
9296
<div class="logo-container fadein">
93-
<img class="logo-img loading" src="{{ asset('littlelink/images/just-gear.svg') }}" alt="Logo" style="">
97+
<img class="logo-img loading" src="{{ asset('littlelink/images/just-gear.svg') }}" alt="Logo">
9498
<div class="logo-centered">l</div>
9599
</div>
96100
<h1 class="loadingtxt">Finishing up</h1>
@@ -101,6 +105,9 @@
101105
if(EnvEditor::keyExists('JOIN_BETA')){ /* Do nothing if key already exists */
102106
} else { EnvEditor::addKey('JOIN_BETA', 'false');} // Adds key to .env file
103107
108+
if(EnvEditor::keyExists('SKIP_UPDATE_BACKUP')){ /* Do nothing if key already exists */
109+
} else { EnvEditor::addKey('SKIP_UPDATE_BACKUP', 'false');} // Adds key to .env file
110+
104111
echo "<meta http-equiv=\"refresh\" content=\"0; " . url()->current() . "?success\" />";
105112
?>
106113
@endif
@@ -109,13 +116,13 @@
109116
<?php //success ?>
110117

111118
<div class="logo-container fadein">
112-
<img class="logo-img" src="{{ asset('littlelink/images/just-gear.svg') }}" alt="Logo" style="">
119+
<img class="logo-img" src="{{ asset('littlelink/images/just-gear.svg') }}" alt="Logo">
113120
<div class="logo-centered">l</div>
114121
</div>
115122
<h1>Success!</h1>
116123
<h4 class="">The update was successful, you can now return to the Admin Panel:</h4>
117124
<br><div class="row">
118-
&ensp;<a class="btn" href="{{ route('studioIndex') }}"><button style=""><i class="fa-solid fa-house-laptop btn"></i> Admin Panel</button></a>&ensp;
125+
&ensp;<a class="btn" href="{{ route('studioIndex') }}"><button><i class="fa-solid fa-house-laptop btn"></i> Admin Panel</button></a>&ensp;
119126
</div>
120127

121128
@endif
@@ -124,13 +131,13 @@
124131
<?php //success ?>
125132

126133
<div class="logo-container fadein">
127-
<img class="logo-img" src="{{ asset('littlelink/images/just-gear.svg') }}" alt="Logo" style="">
134+
<img class="logo-img" src="{{ asset('littlelink/images/just-gear.svg') }}" alt="Logo">
128135
<div class="logo-centered">l</div>
129136
</div>
130137
<h1>Error</h1>
131138
<h4 class="">Something went wrong with the update :(</h4>
132139
<br><div class="row">
133-
&ensp;<a class="btn" href="{{ route('studioIndex') }}"><button style=""><i class="fa-solid fa-house-laptop btn"></i> Admin Panel</button></a>&ensp;
140+
&ensp;<a class="btn" href="{{ route('studioIndex') }}"><button><i class="fa-solid fa-house-laptop btn"></i> Admin Panel</button></a>&ensp;
134141
</div>
135142

136143
@endif

‎routes/web.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
Route::get('/updating', function (\Codedge\Updater\UpdaterManager $updater) {
8787

8888
// Check if new version is available
89-
if($updater->source()->isNewVersionAvailable() and (file_exists(base_path("backups/CANUPDATE")))) {
89+
if($updater->source()->isNewVersionAvailable() and (file_exists(base_path("backups/CANUPDATE")) or env('SKIP_UPDATE_BACKUP') == true)) {
9090

9191
// Get the current installed version
9292
echo $updater->source()->getVersionInstalled();
@@ -100,7 +100,7 @@
100100
// Run the update process
101101
$updater->source()->update($release);
102102

103-
unlink(base_path("backups/CANUPDATE"));
103+
if(env('SKIP_UPDATE_BACKUP') != true) {unlink(base_path("backups/CANUPDATE"));}
104104

105105
echo "<meta http-equiv=\"refresh\" content=\"0; " . url()->current() . "/../update?finishing\" />";
106106

0 commit comments

Comments
 (0)