From 0740b31087ac8b773a3abb3ed4b669a3be85760e Mon Sep 17 00:00:00 2001 From: John Bintz <27256+johnbintz@users.noreply.github.com> Date: Tue, 31 May 2022 23:10:16 -0400 Subject: [PATCH] also-pack won't work --- bin/test_hugo | 12 ++---------- bin/upgrade_hugo | 29 ++++++++--------------------- 2 files changed, 10 insertions(+), 31 deletions(-) diff --git a/bin/test_hugo b/bin/test_hugo index 52c0be3..1752405 100755 --- a/bin/test_hugo +++ b/bin/test_hugo @@ -13,16 +13,8 @@ vagrant-spk vm up vagrant-spk vm halt vagrant-spk vm up -if [[ $build_only == "--build-only" ]]; then - echo "Building for packing only, no web browser will open!" - vagrant-spk dev & pid=$! - # 5 minutes should be enough time... - sleep 600 - kill -INT $pid -else - xdg-open http://local.sandstorm.io:6090/ - vagrant-spk dev -fi +xdg-open http://local.sandstorm.io:6090/ +vagrant-spk dev echo "If everything went well:" echo diff --git a/bin/upgrade_hugo b/bin/upgrade_hugo index 7a59a3b..4db91f1 100755 --- a/bin/upgrade_hugo +++ b/bin/upgrade_hugo @@ -4,10 +4,9 @@ require 'httparty' require 'time' version = ARGV[0] -also_pack = ARGV[1] unless version - puts "Usage: #{$0} --also-pack" + puts "Usage: #{$0} " exit 1 end @@ -40,24 +39,12 @@ end File.open('.sandstorm/sandstorm-pkgdef.capnp', 'w') { |fh| fh.print lines.join } -if also_pack == '--also-pack' - system 'bin/test_hugo --build-only' - system 'bin/pack_hugo' +puts <<~TXT - puts <<~TXT + Now do this: - Now do this: - - * Test fresh and upgrade install - TXT -else - puts <<~TXT - - Now do this: - - * bin/test_hugo - * Test fresh install - * bin/pack_hugo - * Test upgrade install - TXT -end + * bin/test_hugo + * Test fresh install + * bin/pack_hugo + * Test upgrade install +TXT