From 5a8750a9754f46d3bf76b66eb1e03051cbbb29a3 Mon Sep 17 00:00:00 2001 From: Dawa Ometto Date: Thu, 2 Apr 2020 14:08:17 +0200 Subject: [PATCH] Fix migrate script path argument. Fix gollum --version (#1538) --- bin/gollum | 1 + bin/gollum-migrate-tags | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/bin/gollum b/bin/gollum index 7559f12d..9d9544e4 100755 --- a/bin/gollum +++ b/bin/gollum @@ -172,6 +172,7 @@ MSG end opts.on('--version', 'Display the current version of Gollum.') do puts 'Gollum ' + Gollum::VERSION + exit 0 end opts.on('--versions', 'Display the current version of Gollum and auxiliary gems.') do require 'gollum-lib' diff --git a/bin/gollum-migrate-tags b/bin/gollum-migrate-tags index f8bb91de..c52d59b4 100755 --- a/bin/gollum-migrate-tags +++ b/bin/gollum-migrate-tags @@ -4,8 +4,6 @@ require 'optparse' require 'pathname' require 'rubygems' -REPO = ARGV[0] || Dir.pwd - wiki_options = {} options = {} @@ -89,6 +87,8 @@ rescue OptionParser::InvalidOption exit end +REPO = ARGV[0] || Dir.pwd + require 'gollum-lib' if cfg = options[:config]