warding 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c6e2a5ecc183e76cc17c2a4c16379223a2196b8ac65058318d8807629d0596f
-  data.tar.gz: d76f2e4d69c808200b9381b77ebe3e4d3f55c50952d3eb717085af8d916b0e5c
+  metadata.gz: 8c9a32dc1d152b257a75f9135ba8c90744bd0b0b651f13219c0151b1d1b66487
+  data.tar.gz: 49a842f3525b1805b24b3b5017e92aabb6ee2f7001a5886e2c7ddbdddafa8bbb
 SHA512:
-  metadata.gz: 7b60126b88ec985713877eea1403449cce055c54ee958daf2a38b1a7a9bf77b4453373267262e2e41fc2b923d362a7e6a846181c8b53d2c7ece343b4566dd369
-  data.tar.gz: 16f7123ff0d1dec8da58a4e7b6cff307d5a25185fa677493f1721647cf0ff370f8e6fec33cd8c1f8c5ce0707a2bceac018ad3c66696418d2e08eed34fa81838d
+  metadata.gz: '038593e77f575fcb096244b249af59c708b2da350e36d1a3fe048f65c23f13f72dfde781d477d5f2e68243a889b8664cffb45acb16bc012f01d058384f403180'
+  data.tar.gz: 2baa3f15ca340c6baf4bc67c3157a5faf574438e04665ffeb1cff7ee057a25d084560711bef0525fd8a47bbb9ce10cdc73245dd21bfae0b90130ea9b3543e68e

data/README.md

@@ -20,14 +20,12 @@ gem install warding
 
 ## Tasklist
 
-* Move base packages to `pacstrap`.
 * Fix steps that contain pipes.
-* Add `EDITOR` setting.
+* Add default smb conf.
 * Add AUR support.
 * Add `NetworkManager` support.
 * Code missing features.
 * Add extra checks.
-* Test installation.
 * Add GitHub actions.
 * Publish gem/package on GitHub.
 

data/lib/warding.rb

@@ -81,7 +81,7 @@ module Warding
           end
         end
 
-        key(:extra_settings).multi_select("Select extra options:", %w[tools themes cron])
+        key(:extra_settings).multi_select("Select extra options:", %w[desktop-environment hacking-tools crons])
       end
 
       parsed_input
@@ -103,7 +103,7 @@ module Warding
           if timezone
             `timedatectl set-timezone #{timezone}`
           else
-            `timedatectl set-timezone "$(curl --fail https://ipapi.co/timezone)"`
+            `timedatectl set-timezone "$(curl -s https://ipapi.co/timezone)"`
           end
         end
 
@@ -156,27 +156,27 @@ module Warding
 
         def setup_packages
           `pacman -Sy`
-          `pacstrap /mnt base base-devel linux linux-firmware lvm2 mkinitcpio man-db nano fuse wget openbsd-netcat dhcpcd samba openssh openvpn unzip vim git zsh`
+          `pacstrap /mnt base base-devel linux linux-firmware lvm2 mkinitcpio reflector man-db nano vi fuse wget openbsd-netcat dhcpcd samba openssh openvpn unzip vim git zsh`
           `genfstab -U /mnt >> /mnt/etc/fstab`
         end
 
         setup_packages
 
         def setup_chroot(lang, keymap, password)
-          `arch-chroot /mnt ln -sf /usr/share/zoneinfo/"$(curl --fail https://ipapi.co/timezone)" /etc/localtime`
+          `arch-chroot /mnt ln -sf /usr/share/zoneinfo/"$(curl -s https://ipapi.co/timezone)" /etc/localtime`
           `arch-chroot /mnt hwclock --systohc`
 
           `echo "#{lang}.UTF-8" > /mnt/etc/locale.gen`
           `arch-chroot /mnt locale-gen`
           `echo "LANG=#{lang}.UTF-8" > /mnt/etc/locale.conf`
-          `echo KEYMAP=#{keymap} > /mnt/etc/vconsole.conf`
+          `echo "KEYMAP=#{keymap}" > /mnt/etc/vconsole.conf`
           `echo "warding" > /mnt/etc/hostname`
           `echo "127.0.0.1 localhost\n::1 localhost\n127.0.1.1 warding.localdomain warding" > /mnt/etc/hosts`
 
-          `arch-chroot /mnt echo -e "#{password}\n#{password}" | passwd`
+          `echo -e "#{password}\n#{password}" | arch-chroot /mnt passwd`
 
           `sed -i "/^HOOK/s/filesystems/lvm2 filesystems/" /mnt/etc/mkinitcpio.conf`
-          `arch-chroot /mnt mkinitcpio -p linux`
+          `arch-chroot /mnt mkinitcpio -p linux 2>/dev/null`
           `arch-chroot /mnt pacman -S intel-ucode --noconfirm`
         end
 
@@ -184,7 +184,7 @@ module Warding
 
         def setup_bootloader(loader)
           if loader == "systemd-boot"
-            `arch-chroot /mnt bootctl install`
+            `arch-chroot /mnt bootctl install 2>/dev/null`
             `echo "title Warding Linux
             linux /vmlinuz-linux
             initrd /intel-ucode.img
@@ -198,44 +198,43 @@ module Warding
         setup_bootloader(data[:system_settings][:bootloader])
 
         def setup_usability
-          # TODO: include gnome desktop
-          `arch-chroot /mnt pacman -S xorg-server xf86-video-intel plasma konsole dolphin kmix sddm kvantum-qt5 --noconfirm`
-          `mkdir /mnt/etc/sddm.conf.d`
-          `echo "[Theme]\nCurrent=breeze" > /mnt/etc/sddm.conf.d/theme.conf`
-          `echo "[Autologin]\nUser=root" > /mnt/etc/sddm.conf.d/login.conf`
           `arch-chroot /mnt systemctl enable dhcpcd`
-          `arch-chroot /mnt systemctl enable sddm`
-          `arch-chroot /mnt wget -q https://blackarch.org/strap.sh -O /tmp/strap.sh; bash /tmp/strap.sh`
-          `arch-chroot /mnt wget -q https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh -O /tmp/zsh.sh; bash /tmp/zsh.sh`
+          `arch-chroot /mnt wget -qO- https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh | sh`
+          `arch-chroot /mnt wget -qO- https://blackarch.org/strap.sh | sh`
         end
 
         setup_usability
 
         def setup_visuals
-          `arch-chroot /mnt wget -q https://raw.githubusercontent.com/PapirusDevelopmentTeam/arc-kde/master/install.sh -O /tmp/theme.sh; bash /tmp/theme.sh`
-          `arch-chroot /mnt wget -q https://git.io/papirus-icon-theme-install -O /tmp/papirus.sh; bash /tmp/papirus.sh`
+          `arch-chroot /mnt pacman -S xorg-server xf86-video-intel plasma konsole dolphin kmix sddm kvantum-qt5`
+          `mkdir -p /mnt/etc/sddm.conf.d`
+          `echo "[Theme]\nCurrent=breeze" > /mnt/etc/sddm.conf.d/theme.conf`
+          `echo "[Autologin]\nUser=root" > /mnt/etc/sddm.conf.d/login.conf`
+          `arch-chroot /mnt systemctl enable sddm`
+          `arch-chroot /mnt wget -qO- https://raw.githubusercontent.com/PapirusDevelopmentTeam/arc-kde/master/install.sh | sh`
+          `arch-chroot /mnt wget -qO- https://git.io/papirus-icon-theme-install | sh`
         end
 
-        setup_visuals if data[:extra_settings].include?("themes")
+        setup_visuals if data[:extra_settings].include?("desktop-emvironment")
 
-        def setup_extras
+        def setup_tools
           `arch-chroot /mnt pacman -S nmap impacket go ruby php firefox atom hashcat john jre-openjdk proxychains-ng exploitdb httpie metasploit bind-tools radare2 sqlmap wpscan xclip --noconfirm`
           `arch-chroot /mnt mkdir -p /usr/share/wordlists`
           `arch-chroot /mnt wget -q https://github.com/danielmiessler/SecLists/raw/master/Passwords/Leaked-Databases/rockyou.txt.tar.gz -O /usr/share/wordlists/rockyou.txt.tar.gz`
           `arch-chroot /mnt wget -q https://github.com/danielmiessler/SecLists/raw/master/Discovery/Web-Content/common.txt -O /usr/share/wordlists/common.txt`
         end
 
-        setup_extras if data[:extra_settings].include?("tools")
+        setup_tools if data[:extra_settings].include?("hacking-tools")
 
         def setup_cron
           `arch-chroot /mnt pacman -S cronie --noconfirm`
-          `systemctl enable cronie`
-          `#!/bin/bash\nreflector --latest 25 --sort rate --save /etc/pacman.d/mirrorlist > /etc/cron.hourly/mirrorlist`
-          `#!/bin/bash\npacman -Sy > /etc/cron.weekly/pacmansync`
-          `#!/bin/bash\npacman -Syu --noconfirm > /etc/cron.monthly/systemupgrade`
+          `arch-chroot /mnt systemctl enable cronie`
+          `echo "#!/bin/bash\nreflector --latest 25 --sort rate --save /etc/pacman.d/mirrorlist" > /mnt/etc/cron.hourly/mirrorlist; chmod +x /mnt/etc/cron.hourly/mirrorlist`
+          `echo "#!/bin/bash\npacman -Sy" > /mnt/etc/cron.weekly/pacman-sync; chmod +x /mnt/etc/cron.weekly/pacman-sync`
+          `echo "#!/bin/bash\npacman -Syu --noconfirm" > /mnt/etc/cron.monthly/system-upgrade; chmod +x /mnt/etc/cron.monthly/system-upgrade`
         end
 
-        setup_cron if data[:extra_settings].include?("cron")
+        setup_cron if data[:extra_settings].include?("crons")
 
         def finish
           `umount -R /mnt`

data/lib/warding/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Warding
-  VERSION = "0.2.4"
+  VERSION = "0.2.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: warding
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Marlos Pomin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-17 00:00:00.000000000 Z
+date: 2020-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tty-prompt