getch 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6a15cef9d7c838de8e60bb93e4ee6bbe3e0b473c7eb5a8b0e0e003cb7d4edc2d
-  data.tar.gz: ebe82964c26b1b75ea7b0b446fb593b36aa5d1ffa8382138853b4ba52e06c7a3
+  metadata.gz: fd3d032249ccce67db0756a7bfb3d272ed3ddd526eddc87718858f7b946dcfdb
+  data.tar.gz: d177972f815b9e3f3881120a311710347539530630e3a5f8de616d7455d6c3c2
 SHA512:
-  metadata.gz: cad28b0d1459f912f6c587ee2d42c384b1a720e82f6cb96079fc16396d2a4522e0ca5f2099c75e52dbd4159837481b82828df6ff98bca56b9ee8e3fa3a51aa84
-  data.tar.gz: 0eefb3ddfee3658e882a75ac18caef7d25f86442a32511e74ab1167aac6f631b507839d024087f7488615f2f5272bc6fba0adb06562ed3ac8633af4822a42cec
+  metadata.gz: b795b119532c054f28105273141cd747b7dc573c657804134233832fa824314c93b119bd9965970695b073f2ff67009f192310ef0089304e8754fede7cb38075
+  data.tar.gz: 1755beabb76c3a8bbaa9fc574c412593ab64ab726eff58f49caba5ca8e96de1cfec8337fc3e1be327f7d6da3d20c49a37a6ee771d6b45c5c3f7a0d23a704d81d

data/lib/fstab/hybrid.rb

@@ -11,7 +11,7 @@ module Fstab
     # The swap UUID based on the lvm volume /dev/vg/swap
     def write_swap
       # The both use /etc/crypttab
-      if Helpers.runit? or Helpers.systemd?
+      if Getch::Helpers.runit? || Getch::Helpers.systemd?
         echo_a @conf, "/dev/mapper/swap-#{@luks} none swap sw 0 0"
       else
         dm = Getch::Helpers.get_dm "#{@vg}-swap"

data/lib/getch/gentoo/bootloader.rb

@@ -31,7 +31,7 @@ module Getch
       def bootctl
         @boot ?
           with_boot :
-          Chroot.new("bootctl --path #{@esp} install")
+          Chroot.new("bootctl --esp-path=#{@esp} install")
       end
 
       # We need to umount the encrypted /boot first
@@ -39,7 +39,7 @@ module Getch
       def with_boot
         boot = @encrypt ? '/dev/mapper/boot-luks' : "/dev/#{DEVS[:boot]}"
         NiTo.umount "#{OPTIONS[:mountpoint]}/boot"
-        Chroot.new("bootctl --path #{@esp} install")
+        Chroot.new("bootctl --esp-path=#{@esp} install")
         NiTo.mount boot, "#{OPTIONS[:mountpoint]}/boot"
       end
     end

data/lib/getch/version.rb

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

data/lib/luks.rb

@@ -110,7 +110,7 @@ module Luks
     # https://wiki.archlinux.org/title/Advanced_Format#File_systems
     def format_ext4
       @log.info "Formating disk with #{@format}...\n"
-      sh 'mkfs.ext4', '-F', '-b', @bs, "/dev/mapper/#{@luks_name}"
+      Mkfs.ext4 "/dev/mapper/#{@luks_name}"
     end
 
     # https://wiki.archlinux.org/title/Advanced_Format#File_systems

data/lib/mkfs.rb

@@ -4,6 +4,19 @@ require 'getch/command'
 require 'getch/helpers'
 
 module Mkfs
+
+  # Format a path using mkfs.ext4.
+  # @param [string] path, full path e.g /dev/sda1
+  #
+  def self.ext4(path)
+    bs = Getch::Helpers.get_bs(path)
+    if bs == '512'
+      Getch::Command.new('mkfs.ext4', '-F', path)
+    else
+      Getch::Command.new('mkfs.ext4', '-F', '-b', bs, path)
+    end
+  end
+
   class Root
     def initialize(devs, options)
       @efi = devs[:efi] ||= nil
@@ -59,7 +72,7 @@ module Mkfs
 
     def mkfs(path)
       case @fs
-      when 'ext4' then mkfs_ext4 path
+      when 'ext4' then Mkfs.ext4 path
       when 'xfs' then mkfs_xfs path
       end
     end
@@ -72,15 +85,6 @@ module Mkfs
       Getch::Command.new('mkswap', '-f', path)
     end
 
-    def mkfs_ext4(path)
-      bs = Getch::Helpers.get_bs(path)
-      if bs == '512'
-        Getch::Command.new('mkfs.ext4', '-F', path)
-      else
-        Getch::Command.new('mkfs.ext4', '-F', '-b', bs, path)
-      end
-    end
-
     def mkfs_xfs(path)
       bs = Getch::Helpers.get_bs(path)
       Getch::Command.new('mkfs.xfs', '-f', '-s', "size=#{bs}", path)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: getch
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors:
 - szorfein
@@ -36,7 +36,7 @@ cert_chain:
   aEJeKq4/BlIwMlXPe+W5C8zp2i8hgG1/OYbwbGE1p2iRi1NIK7G/HyRqQjOqJxzE
   LLknX69FN7/G
   -----END CERTIFICATE-----
-date: 2022-11-23 00:00:00.000000000 Z
+date: 2022-12-25 00:00:00.000000000 Z
 dependencies: []
 description:
 email: