diff options
| -rw-r--r-- | data/doc/sisu/CHANGELOG_v7 | 2 | ||||
| -rwxr-xr-x | qi | 5 | ||||
| -rw-r--r-- | setup/qi_libs.rb | 9 |
3 files changed, 13 insertions, 3 deletions
diff --git a/data/doc/sisu/CHANGELOG_v7 b/data/doc/sisu/CHANGELOG_v7 index 81d27636..9659015b 100644 --- a/data/doc/sisu/CHANGELOG_v7 +++ b/data/doc/sisu/CHANGELOG_v7 @@ -23,6 +23,8 @@ Reverse Chronological: * 7.1.1.orig.tar.xz (Open commit window: 2015-05-17; Pre-Release)) http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_7.1.1 + * qi (quick install) gem install git version option + * bin/sisu, install name check (stable & git versions) * sisu_7.1.0.orig.tar.xz (2015-05-15:19/5) @@ -243,7 +243,10 @@ module SiSUconf if options[:verbose] end if options[:install] - Gemspecs::Current.install_stable + version=(options[:git_version_number]) \ + ? :version_git + : :version_standard + Gemspecs::Current.install_stable(version) puts 'installed gem, version: stable' \ if options[:verbose] end diff --git a/setup/qi_libs.rb b/setup/qi_libs.rb index 5f325302..e58547b1 100644 --- a/setup/qi_libs.rb +++ b/setup/qi_libs.rb @@ -651,8 +651,13 @@ end def self.build_stable Gemspecs.build(filename) end - def self.install_stable - Gemspecs.install(filename_stable) + def self.install_stable(version=:version_standard) + vi=Version_info::Current.setting_stable + filename=((version==:version_git) \ + && (Version_info.version_number_use(vi) != vi[:version_number])) \ + ? ('sisu-' + Version_info.version_number_use(vi) + '.gem') + : ('sisu-' + vi[:version_number] + '.gem') + Gemspecs.install(filename) end end end |