summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorDaniel Silverstone <dsilvers@digital-scurf.org>2016-12-18 15:05:32 +0000
committerDaniel Silverstone <dsilvers@digital-scurf.org>2016-12-18 15:05:32 +0000
commit5fd394f923fcd28863387a96b1fbbc904efe7ae5 (patch)
tree6f05b8c7e3018260c803e6ef183bb07aa67c6658 /bin
parent78518d1cf53a2647c68242d8f6288a9486bf6cf5 (diff)
downloadgitano-5fd394f923fcd28863387a96b1fbbc904efe7ae5.tar.gz
Tweak ordering for gitano-setup and update manpage
Diffstat (limited to 'bin')
-rw-r--r--bin/gitano-setup.in7
1 files changed, 4 insertions, 3 deletions
diff --git a/bin/gitano-setup.in b/bin/gitano-setup.in
index df904fa..bb3e86b 100644
--- a/bin/gitano-setup.in
+++ b/bin/gitano-setup.in
@@ -163,13 +163,14 @@ if look_for_path(get("paths.ssh")) then
end
end
-assert(file_exists(ask_for("paths.pubkey", gitano.i18n.expand("SETUP_PATHS_PUBKEY_INFO"),
- pubkey_path)),
- gitano.i18n.expand("SETUP_PATHS_PUBKEY_NOT_FOUND"))
assert(file_exists(ask_for("paths.bypasskey", gitano.i18n.expand("SETUP_PATHS_BYPASSKEY_INFO"),
pubkey_path)),
gitano.i18n.expand("SETUP_PATHS_BYPASSKEY_NOT_FOUND"))
+assert(file_exists(ask_for("paths.pubkey", gitano.i18n.expand("SETUP_PATHS_PUBKEY_INFO"),
+ get("paths.home") .. "/admin.pub")),
+ gitano.i18n.expand("SETUP_PATHS_PUBKEY_NOT_FOUND"))
+
ask_for("paths.repos", gitano.i18n.expand("SETUP_PATHS_REPOS_INFO"),
get("paths.home") .. "/repos")