diff options
author | Edvinas Valatka | 2016-05-27 10:57:27 +0300 |
---|---|---|
committer | Edvinas Valatka | 2016-05-27 10:57:27 +0300 |
commit | 0adab72a4180f624b1df77158246b5be7b9297c3 (patch) | |
tree | b1b9552bf1404cd6316117b36a6fc9c209eb7848 | |
parent | ae3d14a14dc1187f9aaf256808824420f2c1a2d8 (diff) | |
download | aur-0adab72a4180f624b1df77158246b5be7b9297c3.tar.gz |
Fix #1646
-rw-r--r-- | .SRCINFO | 2 | ||||
-rw-r--r-- | PKGBUILD | 3 | ||||
-rw-r--r-- | seaf-cli.patch | 112 |
3 files changed, 117 insertions, 0 deletions
@@ -23,6 +23,7 @@ pkgbase = seafile-server source = seahub-preupgrade source = create-default-conf-dir.patch source = 0001-Revert-server-put-pids-folder-out-of-seafile-data.patch + source = seaf-cli.patch source = libseafile.in.patch sha256sums = b813be0710ea5a8580b277e03280c69959aae7fc85bf6d5dcb35ad928c53464e sha256sums = 52fb29858f6424052cf01630ad72b5687a4fb259f23f9efc97f08be04a883218 @@ -30,6 +31,7 @@ pkgbase = seafile-server sha256sums = 2a1e079cbea3543f356e6e9571f3d7d2a4b0ab75131ee417115d738ea191c4fb sha256sums = 6bd632f8741b039bad961af3d6850b651e25b7e7a3018d6e2789f350ff93bb78 sha256sums = b1748e826d8e7cccdd825b99864b74dfb5795312f8878d63e9a87105f4382e29 + sha256sums = a8293e977f762c1385867c1c68055f8acfdf3626b04aaf5b7ab62fe41e378bde sha256sums = a2d7f7cf0c59aba97650af62b3cefd0ceb71a1007c34d9369a88e5769c7f6076 pkgname = seafile-server @@ -17,6 +17,7 @@ source=("seafile-server-${pkgver}.tar.gz::https://github.com/haiwen/seafile/arch "seahub-preupgrade" "create-default-conf-dir.patch" "0001-Revert-server-put-pids-folder-out-of-seafile-data.patch" + "seaf-cli.patch" "libseafile.in.patch") sha256sums=('b813be0710ea5a8580b277e03280c69959aae7fc85bf6d5dcb35ad928c53464e' '52fb29858f6424052cf01630ad72b5687a4fb259f23f9efc97f08be04a883218' @@ -24,6 +25,7 @@ sha256sums=('b813be0710ea5a8580b277e03280c69959aae7fc85bf6d5dcb35ad928c53464e' '2a1e079cbea3543f356e6e9571f3d7d2a4b0ab75131ee417115d738ea191c4fb' '6bd632f8741b039bad961af3d6850b651e25b7e7a3018d6e2789f350ff93bb78' 'b1748e826d8e7cccdd825b99864b74dfb5795312f8878d63e9a87105f4382e29' + 'a8293e977f762c1385867c1c68055f8acfdf3626b04aaf5b7ab62fe41e378bde' 'a2d7f7cf0c59aba97650af62b3cefd0ceb71a1007c34d9369a88e5769c7f6076') prepare () { @@ -33,6 +35,7 @@ prepare () { patch -p1 -i "${srcdir}/0001-Revert-server-put-pids-folder-out-of-seafile-data.patch" patch -p1 -i "${srcdir}/create-default-conf-dir.patch" patch -p1 -i "${srcdir}/libseafile.in.patch" + patch -p1 -i "${srcdir}/seaf-cli.patch" # Fix all script's python 2 requirement grep -s -l -r '#!/usr/bin/env python' "${srcdir}/seafile-${pkgver}-server" \ diff --git a/seaf-cli.patch b/seaf-cli.patch new file mode 100644 index 000000000000..6aff08babf74 --- /dev/null +++ b/seaf-cli.patch @@ -0,0 +1,112 @@ +diff --git a/app/seaf-cli b/app/seaf-cli +index 5772476..544ae7f 100755 +--- a/app/seaf-cli ++++ b/app/seaf-cli +@@ -145,7 +145,7 @@ def _config_valid(conf): + return True + + +-def _conf_dir(): ++def _conf_dir(args): + ''' Determine and return the value of conf_dir ''' + conf_dir = DEFAULT_CONF_DIR + if args.confdir: +@@ -277,7 +277,7 @@ def seaf_start_all(args): + def seaf_start_ccnet(args): + ''' Start ccnet daemon ''' + +- conf_dir = _conf_dir() ++ conf_dir = _conf_dir(args) + + print "Starting ccnet daemon ..." + +@@ -291,7 +291,7 @@ def seaf_start_ccnet(args): + def seaf_start_seafile(args): + ''' start seafile daemon ''' + +- conf_dir = _conf_dir() ++ conf_dir = _conf_dir(args) + + print "Starting seafile daemon ..." + +@@ -306,7 +306,7 @@ def seaf_start_seafile(args): + def seaf_stop(args): + '''Stop seafile daemon ''' + +- conf_dir = _conf_dir() ++ conf_dir = _conf_dir(args) + + pool = ccnet.ClientPool(conf_dir) + client = pool.get_client() +@@ -320,7 +320,7 @@ def seaf_stop(args): + def seaf_list(args): + '''List local libraries''' + +- conf_dir = _conf_dir() ++ conf_dir = _conf_dir(args) + + pool = ccnet.ClientPool(conf_dir) + seafile_rpc = seafile.RpcClient(pool, req_pool=False) +@@ -334,7 +334,7 @@ def seaf_list(args): + def seaf_list_remote(args): + '''List remote libraries''' + +- conf_dir = _conf_dir() ++ conf_dir = _conf_dir(args) + + url = args.server + if not url: +@@ -380,7 +380,7 @@ def get_base_url(url): + def seaf_download(args): + '''Download a library from seafile server ''' + +- conf_dir = _conf_dir() ++ conf_dir = _conf_dir(args) + + repo = args.library + if not repo: +@@ -453,7 +453,7 @@ def seaf_download_by_name(args): + '''Download a library defined by name from seafile server''' + id = None + +- conf_dir = _conf_dir() ++ conf_dir = _conf_dir(args) + + libraryname = args.libraryname + if not libraryname: +@@ -497,7 +497,7 @@ def seaf_download_by_name(args): + def seaf_sync(args): + ''' synchronize a library from seafile server ''' + +- conf_dir = _conf_dir() ++ conf_dir = _conf_dir(args) + + repo = args.library + if not repo: +@@ -571,7 +571,7 @@ def seaf_sync(args): + def seaf_desync(args): + '''Desynchronize a library from seafile server''' + +- conf_dir = _conf_dir() ++ conf_dir = _conf_dir(args) + + repo_path = args.folder + if not repo_path: +@@ -599,7 +599,7 @@ def seaf_desync(args): + def seaf_config(args): + '''Configure the seafile client''' + +- conf_dir = _conf_dir() ++ conf_dir = _conf_dir(args) + + config_key = args.key + if not config_key: +@@ -623,7 +623,7 @@ def seaf_config(args): + def seaf_status(args): + '''Show status''' + +- conf_dir = _conf_dir() ++ conf_dir = _conf_dir(args) + + pool = ccnet.ClientPool(conf_dir) + ccnet_rpc = ccnet.CcnetRpcClient(pool, req_pool=False) |