From ffc7bb0c24e99a0da56dbef6ddb4bbc969c15ecb Mon Sep 17 00:00:00 2001
From: nightpool <nightpool@cybre.space>
Date: Sat, 18 Jul 2020 12:24:54 -0400
Subject: [PATCH] bug fixes

---
 .travis.yml |  4 +++-
 Rakefile    | 21 +++++++++++++--------
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 65f8405..727b14e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,7 +27,9 @@ before_install:
   - if [ "$TRAVIS_OS_NAME" == "osx" -a "$TRAVIS_RUBY_VERSION" != "system" ]; then gem update bundler; fi
 script:
   - git submodule update --init
-  - bundle exec rake spec binary osx_varients --trace
+  - bundle exec rake spec binary --trace
+before_deploy:
+  - bundle exec rake osx_varients --trace
 deploy:
   provider: releases
   file_glob: true
diff --git a/Rakefile b/Rakefile
index 1196a82..a58bcea 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,6 +1,7 @@
 require 'bundler/setup'
 require 'rspec/core/rake_task'
 require 'tmpdir'
+require 'rubygems/package'
 
 Bundler::GemHelper.install_tasks
 RSpec::Core::RakeTask.new :spec
@@ -48,8 +49,6 @@ end
 
 desc "build a binary gem #{Helpers.binary_gem_name}"
 task :binary => :compile do
-  require 'rubygems/package'
-
   gemspec = Helpers.binary_gemspec
 
   FileUtils.chmod 0644, gemspec.files
@@ -106,13 +105,19 @@ end
 task :default => [:compile, :spec]
 task :build => [:clean]
 
-desc 'Generate OSX varient platform names'
-task :osx_varients => [:compile] do
-  gemspec = binary_gemspec
-  return unless gemspec.platform == 'osx'
+desc 'Generate OSX varient platform names. Requires `compile` to already have been run.'
+task :osx_varients do
+  gemspec = Helpers.binary_gemspec
+  next unless gemspec.platform.os == 'osx'
 
   %w(x86_64 universal).each do |cpu|
-    gemspec.platform.cpu = cpu
-    Gem::Package.build gemspec
+    platform = gemspec.platform.dup
+    next unless platform.cpu != cpu
+
+    platform.cpu = cpu
+    gemspec.platform = platform
+
+    package = Gem::Package.build gemspec
+    FileUtils.mv package, 'pkg'
   end
 end