getch 0.3.3 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e6d53101249982f83b05a372decd08d8967c52fc952b930dff7bf4d6c31634f
-  data.tar.gz: 3410eab0dff20d434691e6ddb7e5f8279c6a2eb70e4d675ac5791932638cb614
+  metadata.gz: 6a15cef9d7c838de8e60bb93e4ee6bbe3e0b473c7eb5a8b0e0e003cb7d4edc2d
+  data.tar.gz: ebe82964c26b1b75ea7b0b446fb593b36aa5d1ffa8382138853b4ba52e06c7a3
 SHA512:
-  metadata.gz: d96be1666a606ef3eacd482bc539e75612844cf83406095113566901c42834e3e604d23908bbd87ab41b830c6fd1d6381a3ae36f04122c0b184dbebba192f0f8
-  data.tar.gz: 9ff7cb0caa78084a6bc04a6e72acec5c582e17191473583ffd0fcf9401e9275b9ae8ed9e59f68e49be0a4477f78b941348bba550c7b3d6e99b7181725b08bad9
+  metadata.gz: cad28b0d1459f912f6c587ee2d42c384b1a720e82f6cb96079fc16396d2a4522e0ca5f2099c75e52dbd4159837481b82828df6ff98bca56b9ee8e3fa3a51aa84
+  data.tar.gz: 0eefb3ddfee3658e882a75ac18caef7d25f86442a32511e74ab1167aac6f631b507839d024087f7488615f2f5272bc6fba0adb06562ed3ac8633af4822a42cec

data/CHANGELOG.md

@@ -1,4 +1,12 @@
-## 0.3.2, release 2022-10-01
+## 0.3.5, release 2022-11-21
+* Tested on a live Ubuntu 22.10.
+* Ensure `dracut.conf.d` exist before writing to it.
+* Display the version with `-v`, `--version`.
+
+## 0.3.4, release 2022-10-10
+* Can work on a Live image of Voidlinux
+
+## 0.3.3, release 2022-10-01
 * Support disk with a sector size of 512.
 * Support vdx disk.
 

data/README.md

@@ -40,13 +40,17 @@ Boot Manager:
 
 The ISO images i was able to test and that works:
 + [Archlinux](https://www.archlinux.org/download/)
-+ [Archaeidae](https://github.com/szorfein/archaeidae): Custom Archiso that includes ZFS support.
++ [Portia](https://github.com/szorfein/portia/releases): Custom Archiso that includes ZFS support and Ruby.
+* [Ubuntu 22.10](https://cdimage.ubuntu.com/releases/22.10/release/)
+* [Voidlinux](https://voidlinux.org/download/)
 
 You can also use your current `linux` host, just pay attention to the disk that will be used.  
 
 ## Dependencies
 Getch is build without external libs, so it only require `ruby >= 2.5`.
 
+On a live image of Void, you need to install `xbps-install -S ruby xz gptfdisk`.
+
 ## Install
 Getch is cryptographically signed, so add my public key (if you haven’t already) as a trusted certificate.  
 With `gem` installed:

data/lib/dracut/root.rb

@@ -24,6 +24,7 @@ module Dracut
     protected
 
     def host_only
+      mkdir "#{@mountpoint}/etc/dracut.conf.d"
       file = "#{@mountpoint}/etc/dracut.conf.d/host.conf"
       echo file, 'hostonly="yes"'
       echo_a file, 'use_fstab="yes"'

data/lib/getch/helpers.rb

@@ -29,7 +29,7 @@ module Getch
 
     def self.get_file_online(url, dest)
       URI.open(url) do |l|
-        File.open(dest, "wb") { |f| f.write(l.read) }
+        File.open(dest, 'wb') { |f| f.write(l.read) }
       end
     rescue Net::OpenTimeout => e
       abort "DNS error #{e}"

data/lib/getch/options.rb

@@ -84,6 +84,11 @@ module Getch
           OPTIONS[:verbose] = true
         end
 
+        opts.on('-v', '--version', 'Display the version.') do
+          puts "Getch v#{VERSION}"
+          exit
+        end
+
         opts.on('-h', '--help', 'Display this') do
           puts opts
           exit

data/lib/getch/version.rb

@@ -1,3 +1,3 @@
 module Getch
-  VERSION = '0.3.3'.freeze
+  VERSION = '0.3.5'.freeze
 end

data/lib/getch/void/tarball.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'open-uri'
 require 'open3'
 
 module Getch
@@ -15,7 +14,7 @@ module Getch
       end
 
       def x
-        search_archive
+        @xbps = search_archive
         download
         checksum
         install
@@ -29,14 +28,19 @@ module Getch
           /void-x86_64-ROOTFS-[\d._]+.tar.xz/
       end
 
-      # Search only the glibc x86_64 for now
+      # Search the name of the last release in @file 'sha256sum.txt'
+      # Should find a line like this:
+      # SHA256 (void-x86_64-ROOTFS-20210930.tar.xz) = 8681b060e39e173682e1721a6088280c2b6eade628f5e5e3e8e4b74163d187f6
       def search_archive
         yurl = "#{@url}/#{@file}"
         @log.info "Opening #{yurl}...\n"
         Helpers.get_file_online(yurl, @file)
         File.open(@file).each do |l|
-          @xbps = l.tr('()', '').split(' ') if l.match(tarball)
+          matchrule = l.tr('()', '').split(' ') if l.match(tarball)
+          return matchrule if matchrule && matchrule[1] =~ /^void/
         end
+
+        raise "No valid archive found on #{@file}."
       end
 
       def download
@@ -55,10 +59,10 @@ module Getch
         _, stderr, status = Open3.capture3(command)
         if status.success? then
           @log.result_ok
-          return
+        else
+          cleaning
+          @log.fatal "Problem with the checksum, relaunch getch.\n#{stderr}"
         end
-        cleaning
-        @log.fatal "Problem with the checksum, stderr\n#{stderr}"
       end
 
       def install
@@ -74,10 +78,9 @@ module Getch
         _, stderr, status = Open3.capture3(cmd)
         if status.success? then
           @log.result_ok
-          return
+        else
+          @log.fatal "Fail to decompressing #{@xbps[1]} - #{stderr}."
         end
-        cleaning
-        @log.fatal "Fail to decompressing #{@xbps[1]} - #{stderr}."
       end
 
       def cleaning

data/lib/getch/void/update.rb

@@ -25,7 +25,7 @@ module Getch
 
       def update
         ChrootOutput.new '/usr/bin/xbps-install -uy'
-        ChrootOutput.new '/usr/bin/xbps-install -y base-system'
+        ChrootOutput.new '/usr/bin/xbps-install', '-Sy', 'base-system'
         ChrootOutput.new '/usr/bin/xbps-remove -y base-voidstrap'
       end
     end

data/lib/nito.rb

@@ -55,12 +55,12 @@ module NiTo
 
   # Like echo 'content' > to_file
   def echo(file, content)
-    File.write file, "#{content}\n", mode: 'w'
+    File.write(file, "#{content}\n")
   end
 
   # Like echo 'content' >> to_file
   def echo_a(file, content)
-    File.write file, "#{content}\n", mode: 'a' unless grep? file, content
+    File.write(file, "#{content}\n", mode: 'a') unless grep? file, content
   end
 
   def cp(src, dest)
@@ -69,7 +69,7 @@ module NiTo
 
   # create a void file
   def touch(file)
-    File.write file, '' unless File.exist? file
+    File.write(file, '') unless File.exist? file
   end
 
   # Like sed -i /old:new/ file

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: getch
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.5
 platform: ruby
 authors:
 - szorfein
@@ -36,7 +36,7 @@ cert_chain:
   aEJeKq4/BlIwMlXPe+W5C8zp2i8hgG1/OYbwbGE1p2iRi1NIK7G/HyRqQjOqJxzE
   LLknX69FN7/G
   -----END CERTIFICATE-----
-date: 2022-10-01 00:00:00.000000000 Z
+date: 2022-11-23 00:00:00.000000000 Z
 dependencies: []
 description:
 email:
@@ -191,7 +191,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.19
+rubygems_version: 3.3.23
 signing_key:
 specification_version: 4
 summary: A CLI tool to install Gentoo or VoidLinux.