kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-11-15 03:20:10 +01:00
Code Activity

Merge branch 'fdroid-deploy' into 'master'

Browse Source 
rename `fdroid server` to `fdroid deploy` and deprecate 'init'

Closes #264

See merge request fdroid/fdroidserver!462
This commit is contained in:
Marcus 2018-02-14 21:51:11 +00:00
commit 997289d9ca
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
completion/bash-completion
View File

@ -282,10 +282,10 @@ __complete_stats() {
__complete_options __complete_options
} }
__complete_server() { __complete_deploy() {
opts="-i -v -q" opts="-i -v -q"
lopts="--identity-file --local-copy-dir --sync-from-local-copy-dir lopts="--identity-file --local-copy-dir --sync-from-local-copy-dir
--verbose --quiet --no-checksum update" --verbose --quiet --no-checksum"
__complete_options __complete_options
} }
@ -316,6 +316,7 @@ __cmds=" \
btlog \ btlog \
build \ build \
checkupdates \ checkupdates \
deploy \
dscanner \ dscanner \
gpgsign \ gpgsign \
import \ import \
@ -328,7 +329,6 @@ publish \
readmeta \ readmeta \
rewritemeta \ rewritemeta \
scanner \ scanner \
server \
signatures \ signatures \
signindex \ signindex \
stats \ stats \

8
fdroid
View File

@ -34,6 +34,7 @@ commands = OrderedDict([
("publish", _("Sign and place packages in the repo")), ("publish", _("Sign and place packages in the repo")),
("gpgsign", _("Add PGP signatures using GnuPG for packages in repo")), ("gpgsign", _("Add PGP signatures using GnuPG for packages in repo")),
("update", _("Update repo information for new packages")), ("update", _("Update repo information for new packages")),
("deploy", _("Interact with the repo HTTP server")),
("verify", _("Verify the integrity of downloaded packages")), ("verify", _("Verify the integrity of downloaded packages")),
("checkupdates", _("Check for updates to applications")), ("checkupdates", _("Check for updates to applications")),
("import", _("Add a new application from its source code")), ("import", _("Add a new application from its source code")),
@ -44,7 +45,7 @@ commands = OrderedDict([
("scanner", _("Scan the source code of a package")), ("scanner", _("Scan the source code of a package")),
("dscanner", _("Dynamically scan APKs post build")), ("dscanner", _("Dynamically scan APKs post build")),
("stats", _("Update the stats of the repo")), ("stats", _("Update the stats of the repo")),
("server", _("Interact with the repo HTTP server")), ("server", _("Old, deprecated name for fdroid deploy")),
("signindex", _("Sign indexes created using update --nosign")), ("signindex", _("Sign indexes created using update --nosign")),
("btlog", _("Update the binary transparency log for a URL")), ("btlog", _("Update the binary transparency log for a URL")),
("signatures", _("Extract signatures from APKs")), ("signatures", _("Extract signatures from APKs")),
@ -122,6 +123,11 @@ def main():
logging.critical("Specifying --verbose and --quiet and the same time is silly") logging.critical("Specifying --verbose and --quiet and the same time is silly")
sys.exit(1) sys.exit(1)
# temporary workaround until server.py becomes deploy.py
if command == 'deploy':
command = 'server'
sys.argv.insert(1, 'update')
# Trick optparse into displaying the right usage when --help is used. # Trick optparse into displaying the right usage when --help is used.
sys.argv[0] += ' ' + command sys.argv[0] += ' ' + command