YunoHost/moulinette
1
0
Fork 0
mirror of https://github.com/YunoHost/moulinette.git synced 2024-09-03 20:06:31 +02:00
Code Issues Projects Releases Packages Wiki Activity

Wget repo from Github instead of cloning it

Browse source
This commit is contained in:
Kload 2013-10-25 08:28:50 +00:00
parent bb16cbd6b3
commit 31ede61a99
1 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
yunohost_app.py
View file

@ -296,7 +296,6 @@ def app_install(app, label=None):
label label
""" """
#TODO: Create tool for ssowat
#TODO: Create tool for nginx (check path availability & stuff) #TODO: Create tool for nginx (check path availability & stuff)
with YunoHostLDAP() as yldap: with YunoHostLDAP() as yldap:
@ -488,12 +487,13 @@ def app_setting(app, key, value=None):
return True return True
def _extract_app_from_file(path): def _extract_app_from_file(path, remove=False):
""" """
Unzip or untar application tarball in app_tmp_folder, or copy it from a directory Unzip or untar application tarball in app_tmp_folder, or copy it from a directory
Keyword arguments: Keyword arguments:
path -- Path of the tarball or directory path -- Path of the tarball or directory
remove -- Remove the tarball after extraction
Returns: Returns:
Dict manifest Dict manifest
@ -504,8 +504,10 @@ def _extract_app_from_file(path):
if ".zip" in path: if ".zip" in path:
extract_result = os.system('cd '+ os.getcwd() +' && unzip '+ path +' -d '+ app_tmp_folder) extract_result = os.system('cd '+ os.getcwd() +' && unzip '+ path +' -d '+ app_tmp_folder)
if remove: os.remove(path)
elif ".tar" in path: elif ".tar" in path:
extract_result = os.system('cd '+ os.getcwd() +' && tar -xf '+ path +' -C '+ app_tmp_folder) extract_result = os.system('cd '+ os.getcwd() +' && tar -xf '+ path +' -C '+ app_tmp_folder)
if remove: os.remove(path)
elif (path[:1] == '/' and os.path.exists(path)) or (os.system('cd '+ os.getcwd() +'/'+ path) == 0): elif (path[:1] == '/' and os.path.exists(path)) or (os.system('cd '+ os.getcwd() +'/'+ path) == 0):
shutil.rmtree(app_tmp_folder) shutil.rmtree(app_tmp_folder)
if path[len(path)-1:] != '/': if path[len(path)-1:] != '/':
@ -553,9 +555,6 @@ def _fetch_app_from_git(app):
raise YunoHostError(1, _("Invalid App manifest")) raise YunoHostError(1, _("Invalid App manifest"))
else: else:
app_tmp_folder = install_tmp +'/'+ app
if os.path.exists(app_tmp_folder): shutil.rmtree(app_tmp_folder)
app_dict = app_list(raw=True) app_dict = app_list(raw=True)
if app in app_dict: if app in app_dict:
@ -565,6 +564,17 @@ def _fetch_app_from_git(app):
else: else:
raise YunoHostError(22, _("App doesn't exists")) raise YunoHostError(22, _("App doesn't exists"))
if "github.com" in app_info['git']['url']:
url = app_info['git']['url'].replace("git@github.com:", "https://github.com/")
if ".git" in url[-4:]: url = url[:-4]
if "/" in url [-1:]: url = url[:-1]
url = url + "/archive/"+ str(app_info['git']['revision']) + ".zip"
if os.system('wget "'+ url +'" -O "'+ app_tmp_folder +'.zip"') == 0:
return _extract_app_from_file(app_tmp_folder +'.zip', remove=True)
app_tmp_folder = install_tmp +'/'+ app
if os.path.exists(app_tmp_folder): shutil.rmtree(app_tmp_folder)
git_result = os.system('git clone '+ app_info['git']['url'] +' -b '+ app_info['git']['branch'] +' '+ app_tmp_folder) git_result = os.system('git clone '+ app_info['git']['url'] +' -b '+ app_info['git']['branch'] +' '+ app_tmp_folder)
git_result_2 = os.system('cd '+ app_tmp_folder +' && git reset --hard '+ str(app_info['git']['revision'])) git_result_2 = os.system('cd '+ app_tmp_folder +' && git reset --hard '+ str(app_info['git']['revision']))