Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitd1f3ee8

Browse files
committed
Sat Apr 29 19:23:11 ADT 2023
1 parent8cdd82a commitd1f3ee8

File tree

20 files changed

+69
-69
lines changed

20 files changed

+69
-69
lines changed

‎setup.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@
2929
use_distro=distro
3030
# try: # CAUTION: comment lines 30-37 & unindent line 38 if prepared manually
3131
# if is_efi:
32-
#subprocess.check_output([f'./src/prep/{use_distro}_live.sh', f'{args[1]}', f'{args[2]}', f'{args[3]}'])
32+
#sp.check_output([f'./src/prep/{use_distro}_live.sh', f'{args[1]}', f'{args[2]}', f'{args[3]}'])
3333
# else:
34-
#subprocess.check_output([f'./src/prep/{use_distro}_live.sh', f'{args[1]}', f'{args[2]}'])
35-
# exceptsubprocess.CalledProcessError as e:
34+
#sp.check_output([f'./src/prep/{use_distro}_live.sh', f'{args[1]}', f'{args[2]}'])
35+
# exceptsp.CalledProcessError as e:
3636
# print(f"F: There was an error in prep steps! {e.output.decode('utf-8')}")
3737
# else:
3838
__import__(f"src.distros.{distro}.installer")

‎src/ashpk_core.py‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -148,11 +148,11 @@ def check_update():
148148
defchr_delete(snap):
149149
try:
150150
ifos.path.exists(f"/.snapshots/rootfs/snapshot-chr{snap}"):
151-
subprocess.check_output(f"btrfs sub del /.snapshots/boot/boot-chr{snap}",shell=True)
152-
subprocess.check_output(f"btrfs sub del /.snapshots/etc/etc-chr{snap}",shell=True)
151+
sp.check_output(f"btrfs sub del /.snapshots/boot/boot-chr{snap}",shell=True)
152+
sp.check_output(f"btrfs sub del /.snapshots/etc/etc-chr{snap}",shell=True)
153153
#os.system(f"btrfs sub del /.snapshots/rootfs/snapshot-chr{snap}/*{DEBUG}") # error: Not a Btrfs subvolume
154-
subprocess.check_output(f"btrfs sub del /.snapshots/rootfs/snapshot-chr{snap}",shell=True)
155-
exceptsubprocess.CalledProcessError:
154+
sp.check_output(f"btrfs sub del /.snapshots/rootfs/snapshot-chr{snap}",shell=True)
155+
exceptsp.CalledProcessError:
156156
print(f"F: Failed to delete chroot snapshot{snap}.")
157157
# else:
158158
# print(f"Snapshot chroot {snap} deleted.") ### just when debugging
@@ -491,11 +491,11 @@ def get_parent(tree, id):
491491
# Get drive partition
492492
defget_part():
493493
withopen("/.snapshots/ash/part","r")ascpart:
494-
returnsubprocess.check_output(f"blkid | grep '{cpart.read().rstrip()}' | awk -F: '{{print $1}}'",shell=True).decode('utf-8').strip()
494+
returnsp.check_output(f"blkid | grep '{cpart.read().rstrip()}' | awk -F: '{{print $1}}'",shell=True).decode('utf-8').strip()
495495

496496
# Get tmp partition state
497497
defget_tmp(console=False):# By default just "return" which deployment is running ### removed ", secondary=False" as 2nd arg not needed
498-
mount=str(subprocess.check_output("cat /proc/mounts | grep ' / btrfs'",shell=True))
498+
mount=str(sp.check_output("cat /proc/mounts | grep ' / btrfs'",shell=True))
499499
if"deploy-aux-secondary"inmount:
500500
r="deploy-aux-secondary"
501501
elif"deploy-secondary"inmount:
@@ -927,13 +927,13 @@ def service_enable(prof, tmp_prof, snap):
927927
print(f"F: Cannot enable services as snapshot{snap} doesn't exist.")
928928
else:### No need for other checks as this function is not exposed to user
929929
try:
930-
postinst=subprocess.check_output(f"cat{tmp_prof}/packages.conf | grep -E -w '^&' | sed 's|& ||'",shell=True).decode('utf-8').strip().split('\n')
930+
postinst=sp.check_output(f"cat{tmp_prof}/packages.conf | grep -E -w '^&' | sed 's|& ||'",shell=True).decode('utf-8').strip().split('\n')
931931
forcmdinlist(filter(None,postinst)):# remove '' from [''] if no postinstalls
932-
subprocess.check_output(f"chroot /.snapshots/rootfs/snapshot-chr{snap}{cmd}",shell=True)
933-
services=subprocess.check_output(f"cat{tmp_prof}/packages.conf | grep -E -w '^%' | sed 's|% ||'",shell=True).decode('utf-8').strip().split('\n')
932+
sp.check_output(f"chroot /.snapshots/rootfs/snapshot-chr{snap}{cmd}",shell=True)
933+
services=sp.check_output(f"cat{tmp_prof}/packages.conf | grep -E -w '^%' | sed 's|% ||'",shell=True).decode('utf-8').strip().split('\n')
934934
forcmdinlist(filter(None,services)):# remove '' from [''] if no services
935-
subprocess.check_output(f"chroot /.snapshots/rootfs/snapshot-chr{snap}{cmd}",shell=True)
936-
exceptsubprocess.CalledProcessError:
935+
sp.check_output(f"chroot /.snapshots/rootfs/snapshot-chr{snap}{cmd}",shell=True)
936+
exceptsp.CalledProcessError:
937937
print(f"F: Failed to enable service(s) from{prof}.")
938938
return1
939939
else:
@@ -996,7 +996,7 @@ def snapshot_unlock(snap):
996996
# Switch between distros
997997
defswitch_distro():
998998
whileTrue:
999-
map_tmp=subprocess.check_output("cat /boot/efi/EFI/map.txt | awk 'BEGIN { FS = "'"'" === "'"'" } ; { print $1 }'",shell=True).decode('utf-8').strip()
999+
map_tmp=sp.check_output("cat /boot/efi/EFI/map.txt | awk 'BEGIN { FS = "'"'" === "'"'" } ; { print $1 }'",shell=True).decode('utf-8').strip()
10001000
print("Type the name of a distribution to switch to: (type 'list' to list them, 'q' to quit)")
10011001
next_distro=input("> ")
10021002
ifnext_distro=="q":
@@ -1009,11 +1009,11 @@ def switch_distro():
10091009
forrowincsv.DictReader(file,delimiter=',',quoting=csv.QUOTE_NONE):
10101010
ifrow["DISTRO"]==next_distro:
10111011
try:
1012-
boot_order=subprocess.check_output("efibootmgr | grep BootOrder | awk '{print $2}'",shell=True).decode('utf-8').strip()
1012+
boot_order=sp.check_output("efibootmgr | grep BootOrder | awk '{print $2}'",shell=True).decode('utf-8').strip()
10131013
temp=boot_order.replace(f'{row["BootOrder"]},',"")
10141014
new_boot_order=f"{row['BootOrder']},{temp}"
1015-
subprocess.check_output(f'efibootmgr --bootorder{new_boot_order}{DEBUG}',shell=True)
1016-
exceptsubprocess.CalledProcessErrorase:
1015+
sp.check_output(f'efibootmgr --bootorder{new_boot_order}{DEBUG}',shell=True)
1016+
exceptsp.CalledProcessErrorase:
10171017
print(f"F: Failed to switch distros:{e.output}.")###
10181018
else:
10191019
print(f'Done! Please reboot whenever you would like switch to{next_distro}')
@@ -1027,7 +1027,7 @@ def switch_distro():
10271027
defswitch_tmp(secondary=False):
10281028
distro_suffix=get_distro_suffix()
10291029
part=get_part()
1030-
tmp_boot=subprocess.check_output("mktemp -d -p /.snapshots/tmp boot.XXXXXXXXXXXXXXXX",shell=True).decode('utf-8').strip()
1030+
tmp_boot=sp.check_output("mktemp -d -p /.snapshots/tmp boot.XXXXXXXXXXXXXXXX",shell=True).decode('utf-8').strip()
10311031
###TODO with TemporaryDirectory(dir="/.snapshots/tmp", prefix="boot.") as tmp_boot:
10321032
os.system(f"mount{part} -o subvol=@boot{distro_suffix}{tmp_boot}")# Mount boot partition for writing
10331033
# Swap deployment subvolumes: deploy <-> deploy-aux
@@ -1324,7 +1324,7 @@ def yes_no(msg):
13241324
dist=distro.split("_")[0]# Remove '_ashos"
13251325
else:
13261326
sys.exit("F: Operating system could not be detected!")
1327-
GRUB=subprocess.check_output("ls /boot | grep grub",encoding='utf-8',shell=True).strip()
1327+
GRUB=sp.check_output("ls /boot | grep grub",encoding='utf-8',shell=True).strip()
13281328
USERNAME=os.getenv("SUDO_USER")oros.getenv("USER")
13291329
HOME=os.path.expanduser('~'+USERNAME)# type: ignore
13301330

‎src/distros/alpine/ashpk.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ def fix_package_db(snap = 0):
4444
ifflip:
4545
immutability_enable(snap)
4646
print(f"Snapshot{snap}'s package manager database fixed successfully.")
47-
exceptsubprocess.CalledProcessError:
47+
exceptsp.CalledProcessError:
4848
chr_delete(snap)
4949
print("F: Fixing package manager database failed.")
5050

@@ -75,7 +75,7 @@ def install_package_live(pkg, snap, tmp): ### TODO remove 'snapshot' as not used
7575

7676
# Get list of packages installed in a snapshot
7777
defpkg_list(snap,CHR=""):
78-
returnsubprocess.check_output(f"chroot /.snapshots/rootfs/snapshot-{CHR}{snap} apk list -i",encoding='utf-8',shell=True).strip().split("\n")
78+
returnsp.check_output(f"chroot /.snapshots/rootfs/snapshot-{CHR}{snap} apk list -i",encoding='utf-8',shell=True).strip().split("\n")
7979

8080
# Refresh snapshot atomic-operation
8181
defrefresh_helper(snap):

‎src/distros/arch/ashpk.py‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ def fix_package_db(snap = 0):
125125
rr=chroot_in(P)
126126
# Fix package database
127127
# before all these were like: os.system(f"{P}XYZ")
128-
os.system("rm -rf /etc/pacman.d/gnupg $HOME/.gnupg")### $HOME vs /root NEEDS fixing # If folder not present andsubprocess.run is used, throws error and stops
128+
os.system("rm -rf /etc/pacman.d/gnupg $HOME/.gnupg")### $HOME vs /root NEEDS fixing # If folder not present andsp.run is used, throws error and stops
129129
os.system("rm -r /var/lib/pacman/db.lck")
130130
os.system("pacman -Syy")
131131
os.system("gpg --refresh-keys")
@@ -140,7 +140,7 @@ def fix_package_db(snap = 0):
140140
ifflip:
141141
immutability_enable(snap)
142142
print(f"Snapshot{snap}'s package manager database fixed successfully.")
143-
exceptsubprocess.CalledProcessError:
143+
exceptsp.CalledProcessError:
144144
chr_delete(snap)
145145
print("F: Fixing package manager database failed.")
146146

@@ -183,8 +183,8 @@ def install_package_old(pkg, snap):
183183
try:
184184
# This extra pacman check is to avoid unwantedly triggering AUR if package is official but user answers no to prompt
185185
### TODO IMPORTANT this doesn't work for a package group e.g. "lxqt" errors out even though it's not in AUR, which makes following code malfunction!
186-
subprocess.check_output(f"pacman -Si{pkg}",shell=True,stderr=subprocess.PIPE)# --sysroot ### do not print if pkg not found
187-
exceptsubprocess.CalledProcessError:
186+
sp.check_output(f"pacman -Si{pkg}",shell=True,stderr=sp.PIPE)# --sysroot ### do not print if pkg not found
187+
exceptsp.CalledProcessError:
188188
aur=aur_install(snap)### TODO: do a paru -Si {pkg} check to avoid setup_aur if package already installed!
189189
prepare(snap)
190190
ifaur:
@@ -201,8 +201,8 @@ def install_package_live(pkg, snap, tmp):
201201
excode=1### REVIEW
202202
try:
203203
# This extra pacman check is to avoid unwantedly triggering AUR if package is official but user answers no to prompt
204-
subprocess.check_output(f"pacman -Si{pkg}",shell=True)# --sysroot
205-
exceptsubprocess.CalledProcessError:
204+
sp.check_output(f"pacman -Si{pkg}",shell=True)# --sysroot
205+
exceptsp.CalledProcessError:
206206
options=snapshot_config_get(tmp)
207207
ifoptions["aur"]=="True":
208208
aur_in_tmp=True
@@ -239,7 +239,7 @@ def install_package_live(pkg, snap, tmp):
239239

240240
# Get list of packages installed in a snapshot
241241
defpkg_list(snap,CHR=""):
242-
returnsubprocess.check_output(f"chroot /.snapshots/rootfs/snapshot-{CHR}{snap} pacman -Qq",encoding='utf-8',shell=True).strip().split("\n")
242+
returnsp.check_output(f"chroot /.snapshots/rootfs/snapshot-{CHR}{snap} pacman -Qq",encoding='utf-8',shell=True).strip().split("\n")
243243

244244
# Distro-specific function to setup snapshot based on preset parameters
245245
defpresets_helper(prof_cp,snap):### TODO before: prof_section

‎src/distros/arch/installer.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ def main():
2626

2727
# 2. Bootstrap and install packages in chroot
2828
ifKERNELnotin ("-hardened","-lts","-zen"):# AUR required
29-
subprocess.call(f'{installer_dir}/src/distros/{distro}/aur/aurutils.sh',shell=True)
29+
sp.call(f'{installer_dir}/src/distros/{distro}/aur/aurutils.sh',shell=True)
3030
whileTrue:
3131
try:
3232
strap(packages)
33-
exceptsubprocess.CalledProcessErrorase:
33+
exceptsp.CalledProcessErrorase:
3434
print(e)
3535
ifnotyes_no("F: Failed to strap package(s). Retry?"):
3636
unmounts("failed")# user declined
@@ -96,7 +96,7 @@ def initram_update(): # REVIEW removed "{SUDO}" from all lines below
9696
os.system(f"mkinitcpio -p linux{KERNEL}")
9797

9898
defstrap(pkg):
99-
subprocess.check_output(f"{SUDO} pacstrap /mnt --needed{pkg}",shell=True)
99+
sp.check_output(f"{SUDO} pacstrap /mnt --needed{pkg}",shell=True)
100100

101101
main()
102102

‎src/distros/cachyos/ashpk.py‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ def fix_package_db(snapshot = "0"):
113113
immutability_disable(snapshot)
114114
flip=True
115115
prepare(snapshot)
116-
os.system(f"{P}rm -rf /etc/pacman.d/gnupg $HOME/.gnupg")### $HOME vs /root NEEDS fixing # If folder not present andsubprocess.run is used, throws error and stops
116+
os.system(f"{P}rm -rf /etc/pacman.d/gnupg $HOME/.gnupg")### $HOME vs /root NEEDS fixing # If folder not present andsp.run is used, throws error and stops
117117
os.system(f"{P}rm -r /var/lib/pacman/db.lck")
118118
os.system(f"{P}pacman -Syy")
119119
os.system(f"{P}gpg --refresh-keys")
@@ -126,7 +126,7 @@ def fix_package_db(snapshot = "0"):
126126
ifflip:
127127
immutability_enable(snapshot)
128128
print(f"Snapshot{snapshot}'s package manager database fixed successfully.")
129-
exceptsubprocess.CalledProcessError:
129+
exceptsp.CalledProcessError:
130130
chr_delete(snapshot)
131131
print("F: Fixing package manager database failed.")
132132

@@ -148,8 +148,8 @@ def init_system_copy(snapshot, FROM):
148148
definstall_package(snapshot,pkg):
149149
try:
150150
# This extra pacman check is to avoid unwantedly triggering AUR if package is official but user answers no to prompt
151-
subprocess.check_output(f"pacman -Si{pkg}",shell=True)# --sysroot
152-
exceptsubprocess.CalledProcessError:
151+
sp.check_output(f"pacman -Si{pkg}",shell=True)# --sysroot
152+
exceptsp.CalledProcessError:
153153
aur=aur_install(snapshot)### TODO: do a paru -Si {pkg} check to avoid setup_aur if package already installed!
154154
prepare(snapshot)
155155
ifaur:
@@ -165,8 +165,8 @@ def install_package(snapshot, pkg):
165165
definstall_package_live(snapshot,tmp,pkg):
166166
try:
167167
# This extra pacman check is to avoid unwantedly triggering AUR if package is official but user answers no to prompt
168-
subprocess.check_output(f"pacman -Si{pkg}",shell=True)# --sysroot
169-
exceptsubprocess.CalledProcessError:
168+
sp.check_output(f"pacman -Si{pkg}",shell=True)# --sysroot
169+
exceptsp.CalledProcessError:
170170
options=snapshot_config_get(tmp)
171171
ifoptions["aur"]=="True":
172172
aur_in_tmp=True
@@ -209,7 +209,7 @@ def install_package_live(snapshot, tmp, pkg):
209209

210210
# Get list of packages installed in a snapshot
211211
defpkg_list(CHR,snap):
212-
returnsubprocess.check_output(f"chroot /.snapshots/rootfs/snapshot-{CHR}{snap} pacman -Qq",encoding='utf-8',shell=True).strip().split("\n")
212+
returnsp.check_output(f"chroot /.snapshots/rootfs/snapshot-{CHR}{snap} pacman -Qq",encoding='utf-8',shell=True).strip().split("\n")
213213

214214
# Refresh snapshot atomic-operation
215215
defrefresh_helper(snapshot):

‎src/distros/cachyos/installer.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ def main():
3232
whileTrue:
3333
try:
3434
strap(packages)
35-
exceptsubprocess.CalledProcessErrorase:
35+
exceptsp.CalledProcessErrorase:
3636
print(e)
3737
ifnotyes_no("F: Failed to strap package(s). Retry?"):
3838
unmounts("failed")# user declined
@@ -98,7 +98,7 @@ def initram_update(KERNEL): # REVIEW removed "{SUDO}" from all lines below
9898
os.system(f"mkinitcpio -p linux{KERNEL}")
9999

100100
defstrap(pkg):
101-
subprocess.check_output(f"{SUDO} pacstrap /mnt --needed{pkg}",shell=True)
101+
sp.check_output(f"{SUDO} pacstrap /mnt --needed{pkg}",shell=True)
102102

103103
main()
104104

‎src/distros/debian/ashpk.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ def install_package_live(snapshot, tmp, pkg):
4949

5050
# Get list of packages installed in a snapshot
5151
defpkg_list(CHR,snap):
52-
returnsubprocess.check_output(f"chroot /.snapshots/rootfs/snapshot-{CHR}{snap} dpkg -l | grep '^.i' | awk '{{print $2}}'",encoding='utf-8',shell=True).strip().split("\n")
52+
returnsp.check_output(f"chroot /.snapshots/rootfs/snapshot-{CHR}{snap} dpkg -l | grep '^.i' | awk '{{print $2}}'",encoding='utf-8',shell=True).strip().split("\n")
5353

5454
# Refresh snapshot atomic-operation
5555
defrefresh_helper(snapshot):

‎src/distros/endeavouros/ashpk.py‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ def fix_package_db(snapshot = "0"):
113113
immutability_disable(snapshot)
114114
flip=True
115115
prepare(snapshot)
116-
os.system(f"{P}rm -rf /etc/pacman.d/gnupg $HOME/.gnupg")### $HOME vs /root NEEDS fixing # If folder not present andsubprocess.run is used, throws error and stops
116+
os.system(f"{P}rm -rf /etc/pacman.d/gnupg $HOME/.gnupg")### $HOME vs /root NEEDS fixing # If folder not present andsp.run is used, throws error and stops
117117
os.system(f"{P}rm -r /var/lib/pacman/db.lck")
118118
os.system(f"{P}pacman -Syy")
119119
os.system(f"{P}gpg --refresh-keys")
@@ -126,7 +126,7 @@ def fix_package_db(snapshot = "0"):
126126
ifflip:
127127
immutability_enable(snapshot)
128128
print(f"Snapshot{snapshot}'s package manager database fixed successfully.")
129-
exceptsubprocess.CalledProcessError:
129+
exceptsp.CalledProcessError:
130130
chr_delete(snapshot)
131131
print("F: Fixing package manager database failed.")
132132

@@ -148,8 +148,8 @@ def init_system_copy(snapshot, FROM):
148148
definstall_package(snapshot,pkg):
149149
try:
150150
# This extra pacman check is to avoid unwantedly triggering AUR if package is official but user answers no to prompt
151-
subprocess.check_output(f"pacman -Si{pkg}",shell=True)# --sysroot
152-
exceptsubprocess.CalledProcessError:
151+
sp.check_output(f"pacman -Si{pkg}",shell=True)# --sysroot
152+
exceptsp.CalledProcessError:
153153
aur=aur_install(snapshot)### TODO: do a paru -Si {pkg} check to avoid setup_aur if package already installed!
154154
prepare(snapshot)
155155
ifaur:
@@ -165,8 +165,8 @@ def install_package(snapshot, pkg):
165165
definstall_package_live(snapshot,tmp,pkg):
166166
try:
167167
# This extra pacman check is to avoid unwantedly triggering AUR if package is official but user answers no to prompt
168-
subprocess.check_output(f"pacman -Si{pkg}",shell=True)# --sysroot
169-
exceptsubprocess.CalledProcessError:
168+
sp.check_output(f"pacman -Si{pkg}",shell=True)# --sysroot
169+
exceptsp.CalledProcessError:
170170
options=snapshot_config_get(tmp)
171171
ifoptions["aur"]=="True":
172172
aur_in_tmp=True
@@ -209,7 +209,7 @@ def install_package_live(snapshot, tmp, pkg):
209209

210210
# Get list of packages installed in a snapshot
211211
defpkg_list(CHR,snap):
212-
returnsubprocess.check_output(f"chroot /.snapshots/rootfs/snapshot-{CHR}{snap} pacman -Qq",encoding='utf-8',shell=True).strip().split("\n")
212+
returnsp.check_output(f"chroot /.snapshots/rootfs/snapshot-{CHR}{snap} pacman -Qq",encoding='utf-8',shell=True).strip().split("\n")
213213

214214
# Refresh snapshot atomic-operation
215215
defrefresh_helper(snapshot):

‎src/distros/endeavouros/installer.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@ def main():
2828

2929
# 2. Bootstrap and install packages in chroot
3030
ifKERNELnotin ("-hardened","-lts","-zen"):# AUR required
31-
subprocess.call(f'{installer_dir}/src/distros/{distro}/aur/aurutils.sh',shell=True)
31+
sp.call(f'{installer_dir}/src/distros/{distro}/aur/aurutils.sh',shell=True)
3232
whileTrue:
3333
try:
3434
strap(packages)
35-
exceptsubprocess.CalledProcessErrorase:
35+
exceptsp.CalledProcessErrorase:
3636
print(e)
3737
ifnotyes_no("F: Failed to strap package(s). Retry?"):
3838
unmounts("failed")# user declined
@@ -104,7 +104,7 @@ def initram_update(): # REVIEW removed "{SUDO}" from all lines below
104104
os.system(f"mkinitcpio -p linux{KERNEL}")
105105

106106
defstrap(pkg):
107-
subprocess.check_output(f"{SUDO} pacstrap /mnt --needed{pkg}",shell=True)
107+
sp.check_output(f"{SUDO} pacstrap /mnt --needed{pkg}",shell=True)
108108

109109
main()
110110

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp