Skip to content

Commit d421939

Browse files
CrazyWolf13Lorondos
authored andcommitted
refactor
1 parent dc74081 commit d421939

File tree

1 file changed

+22
-4
lines changed

1 file changed

+22
-4
lines changed

ct/wanderer.sh

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,14 @@ source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxV
77

88
APP="Wanderer"
99
<<<<<<< HEAD
10+
<<<<<<< HEAD
1011
var_tags="${var_tags:-travelling;sport}"
1112
=======
1213
var_tags="${var_tags:-traveling;sport}"
1314
>>>>>>> 056b67a21 ('Add new script')
15+
=======
16+
var_tags="${var_tags:-travelling;sport}"
17+
>>>>>>> a516bb7f5 (refactor)
1418
var_cpu="${var_cpu:-2}"
1519
var_ram="${var_ram:-4096}"
1620
var_disk="${var_disk:-8}"
@@ -34,6 +38,7 @@ function update_script() {
3438
fi
3539

3640
if check_for_gh_release "wanderer" "Flomp/wanderer"; then
41+
<<<<<<< HEAD
3742
<<<<<<< HEAD
3843
msg_info "Stopping service"
3944
systemctl stop wanderer-web
@@ -43,6 +48,11 @@ function update_script() {
4348
systemctl stop wanderer-web
4449
msg_ok "Stopped wanderer service"
4550
>>>>>>> 056b67a21 ('Add new script')
51+
=======
52+
msg_info "Stopping service"
53+
systemctl stop wanderer-web
54+
msg_ok "Stopped service"
55+
>>>>>>> a516bb7f5 (refactor)
4656

4757
fetch_and_deploy_gh_release "wanderer" "Flomp/wanderer" "tarball" "latest" "/opt/wanderer/source"
4858

@@ -55,6 +65,7 @@ function update_script() {
5565
$STD npm run build
5666
msg_ok "Updated wanderer"
5767

68+
<<<<<<< HEAD
5869
<<<<<<< HEAD
5970
msg_info "Starting service"
6071
systemctl start wanderer-web
@@ -73,21 +84,28 @@ function update_script() {
7384
msg_ok "Started service"
7485
=======
7586
msg_info "Starting wanderer service"
87+
=======
88+
msg_info "Starting service"
89+
>>>>>>> a516bb7f5 (refactor)
7690
systemctl start wanderer-web
77-
msg_ok "Started wanderer service"
91+
msg_ok "Started service"
7892
msg_ok "Update Successful"
7993
fi
8094
if check_for_gh_release "meilisearch" "meilisearch/meilisearch"; then
81-
msg_info "Stopping wanderer service"
95+
msg_info "Stopping service"
8296
systemctl stop wanderer-web
83-
msg_ok "Stopped wanderer service"
97+
msg_ok "Stopped service"
8498

8599
fetch_and_deploy_gh_release "meilisearch" "meilisearch/meilisearch" "binary" "latest" "/opt/wanderer/source/search"
86100

87-
msg_info "Starting wanderer service"
101+
msg_info "Starting service"
88102
systemctl start wanderer-web
103+
<<<<<<< HEAD
89104
msg_ok "Started wanderer service"
90105
>>>>>>> 056b67a21 ('Add new script')
106+
=======
107+
msg_ok "Started service"
108+
>>>>>>> a516bb7f5 (refactor)
91109
msg_ok "Update Successful"
92110
fi
93111
exit

0 commit comments

Comments
 (0)