Skip to content

Commit 823d8d1

Browse files
committed
Fix: File copy skip
1 parent ee458a9 commit 823d8d1

3 files changed

Lines changed: 8 additions & 118 deletions

File tree

alteriso5/utils/copy.go

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package utils
22

33
import (
44
"io/fs"
5+
"log/slog"
56
"os"
67
"path/filepath"
78

@@ -17,7 +18,9 @@ type CopyTask struct {
1718

1819
func (c *CopyTask) Copy() error {
1920

20-
opt := cp.Options{}
21+
opt := cp.Options{
22+
Skip: c.Skip,
23+
}
2124

2225
if c.Perm != 0 {
2326
opt.PermissionControl = cp.AddPermission(c.Perm)
@@ -28,10 +31,13 @@ func (c *CopyTask) Copy() error {
2831

2932
func OnlySpecificExtention(ext string) func(srcinfo os.FileInfo, src, dest string) (bool, error) {
3033
return func(srcinfo os.FileInfo, src, dest string) (bool, error) {
34+
//slog.Debug("Checking file", "file", src)
3135
if srcinfo.IsDir() {
36+
//slog.Debug("Skipping directory", "dir", src)
3237
return false, nil
3338
}
3439
if filepath.Ext(src) != ext {
40+
slog.Debug("Skipping file", "file", src, "ext", filepath.Ext(src))
3541
return true, nil
3642
}
3743
return false, nil

alteriso5/work/boot/xorriso.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package boot
22

33
import (
4-
"fmt"
54
"log/slog"
65
"os"
76
"os/exec"
@@ -49,7 +48,7 @@ func (x *xorriso) Build(dir string, out string, bootmode ...Mode) error {
4948
cmd.Stdin = os.Stdin
5049
cmd.Stderr = os.Stderr
5150

52-
fmt.Println(*args)
51+
slog.Debug("Running xorriso", "args", cmd.Args)
5352

5453
return cmd.Run()
5554
}

profile/packages.x86_64

Lines changed: 0 additions & 115 deletions
Original file line numberDiff line numberDiff line change
@@ -1,131 +1,16 @@
1-
alsa-utils
2-
amd-ucode
31
arch-install-scripts
4-
archinstall
5-
b43-fwcutter
62
base
7-
bcachefs-tools
8-
bind
9-
bolt
10-
brltty
11-
broadcom-wl
12-
btrfs-progs
13-
clonezilla
14-
cloud-init
15-
cryptsetup
16-
darkhttpd
17-
ddrescue
18-
dhclient
19-
dhcpcd
20-
diffutils
21-
dmidecode
22-
dmraid
23-
dnsmasq
243
dosfstools
254
e2fsprogs
265
edk2-shell
276
efibootmgr
28-
espeakup
29-
ethtool
30-
exfatprogs
31-
f2fs-tools
32-
fatresize
33-
foot-terminfo
34-
fsarchiver
35-
gnu-netcat
36-
gpart
37-
gpm
38-
gptfdisk
39-
grml-zsh-config
407
grub
41-
hdparm
42-
hyperv
43-
intel-ucode
44-
irssi
45-
iw
46-
iwd
47-
jfsutils
48-
kitty-terminfo
49-
ldns
50-
less
51-
lftp
52-
libfido2
53-
libusb-compat
548
linux
55-
linux-atm
56-
linux-firmware
57-
linux-firmware-marvell
58-
livecd-sounds
59-
lsscsi
60-
lvm2
61-
lynx
62-
man-db
63-
man-pages
64-
mc
65-
mdadm
66-
memtest86+
67-
memtest86+-efi
689
mkinitcpio
6910
mkinitcpio-archiso
70-
mkinitcpio-nfs-utils
71-
modemmanager
72-
mtools
73-
nano
74-
nbd
75-
ndisc6
76-
nfs-utils
77-
nilfs-utils
78-
nmap
79-
ntfs-3g
80-
nvme-cli
81-
open-iscsi
82-
open-vm-tools
83-
openconnect
84-
openpgp-card-tools
85-
openssh
86-
openvpn
87-
partclone
88-
parted
89-
partimage
90-
pcsclite
91-
ppp
92-
pptpclient
93-
pv
9411
qemu-guest-agent
9512
refind
96-
reflector
97-
reiserfsprogs
98-
rp-pppoe
99-
rsync
100-
rxvt-unicode-terminfo
101-
screen
102-
sdparm
103-
sequoia-sq
104-
sg3_utils
105-
smartmontools
106-
sof-firmware
10713
squashfs-tools
10814
sudo
10915
syslinux
110-
systemd-resolvconf
111-
tcpdump
112-
terminus-font
113-
testdisk
114-
tmux
115-
tpm2-tools
116-
tpm2-tss
117-
udftools
118-
usb_modeswitch
119-
usbmuxd
120-
usbutils
121-
vim
122-
virtualbox-guest-utils-nox
123-
vpnc
124-
wezterm-terminfo
125-
wireless-regdb
126-
wireless_tools
127-
wpa_supplicant
128-
wvdial
129-
xfsprogs
130-
xl2tpd
13116
zsh

0 commit comments

Comments
 (0)