mirror of
https://github.com/CMiksche/gitea-auto-update
synced 2025-12-10 16:07:23 +01:00
removed merge text
This commit is contained in:
@@ -9,7 +9,6 @@ License: GNU General Public License
|
|||||||
import settings
|
import settings
|
||||||
import requests
|
import requests
|
||||||
import os
|
import os
|
||||||
<<<<<<< HEAD
|
|
||||||
|
|
||||||
|
|
||||||
# Function to download a file
|
# Function to download a file
|
||||||
@@ -36,9 +35,6 @@ def buildFromSource(tag):
|
|||||||
os.system('TAGS="bindata sqlite sqlite_unlock_notify" make generate build')
|
os.system('TAGS="bindata sqlite sqlite_unlock_notify" make generate build')
|
||||||
# Move binary
|
# Move binary
|
||||||
os.system("mv gitea "+settings.gtfile)
|
os.system("mv gitea "+settings.gtfile)
|
||||||
=======
|
|
||||||
import functions
|
|
||||||
>>>>>>> 38e9451f8a230c9110e7b43f34cd64f375858f71
|
|
||||||
|
|
||||||
def is_tool(name):
|
def is_tool(name):
|
||||||
##Check whether `name` is on PATH and marked as executable.
|
##Check whether `name` is on PATH and marked as executable.
|
||||||
@@ -83,7 +79,6 @@ if functions.checkVersion(github_version, current_version):
|
|||||||
print (shadownload)
|
print (shadownload)
|
||||||
|
|
||||||
# Download file
|
# Download file
|
||||||
<<<<<<< HEAD
|
|
||||||
|
|
||||||
## downloading sha
|
## downloading sha
|
||||||
print ("downloading sha256 hashsum")
|
print ("downloading sha256 hashsum")
|
||||||
@@ -110,9 +105,6 @@ if functions.checkVersion(github_version, current_version):
|
|||||||
else:
|
else:
|
||||||
print ("error")
|
print ("error")
|
||||||
quit()
|
quit()
|
||||||
=======
|
|
||||||
functions.download(gtdownload, settings.gtfile)
|
|
||||||
>>>>>>> 38e9451f8a230c9110e7b43f34cd64f375858f71
|
|
||||||
|
|
||||||
# Start systemd service
|
# Start systemd service
|
||||||
print ("starting gitea.service")
|
print ("starting gitea.service")
|
||||||
|
|||||||
Reference in New Issue
Block a user