Skip to content

Commit 66c9080

Browse files
arcolinuxzarcolinuxz
committed
update
1 parent 4da3df1 commit 66c9080

File tree

5 files changed

+29
-39
lines changed

5 files changed

+29
-39
lines changed

‎usr/share/archlinux-tweak-tool/archlinux-tweak-tool.py‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -663,11 +663,10 @@ def __init__(self):
663663

664664
# ========================ARCH REPO=============================
665665

666-
arch_testing = pmf.check_repo("[testing]")
666+
arch_testing = pmf.check_repo("[core-testing]")
667667
arch_core = pmf.check_repo("[core]")
668668
arch_extra = pmf.check_repo("[extra]")
669-
arch_community_testing = pmf.check_repo("[community-testing]")
670-
arch_community = pmf.check_repo("[community]")
669+
arch_community = pmf.check_repo("[extra-testing]")
671670
arch_multilib_testing = pmf.check_repo("[multilib-testing]")
672671
arch_multilib = pmf.check_repo("[multilib]")
673672

@@ -731,7 +730,6 @@ def __init__(self):
731730
self.checkbutton2.set_active(arch_testing)
732731
self.checkbutton6.set_active(arch_core)
733732
self.checkbutton7.set_active(arch_extra)
734-
self.checkbutton4.set_active(arch_community_testing)
735733
self.checkbutton5.set_active(arch_community)
736734
self.checkbutton3.set_active(arch_multilib_testing)
737735
self.checkbutton8.set_active(arch_multilib)
@@ -2989,7 +2987,7 @@ def on_xero_nv_toggle(self, widget, active):
29892987
pmf.toggle_test_repos(self, widget.get_active(), "xero_nv")
29902988

29912989
def on_pacman_toggle1(self, widget, active):
2992-
if not pmf.repo_exist("[testing]"):
2990+
if not pmf.repo_exist("[core-testing]"):
29932991
pmf.append_repo(self, fn.arch_testing_repo)
29942992
print("Repo has been added to /etc/pacman.conf")
29952993
fn.show_in_app_notification(self, "Repo has been added to /etc/pacman.conf")
@@ -3016,17 +3014,17 @@ def on_pacman_toggle3(self, widget, active):
30163014
pmf.toggle_test_repos(self, widget.get_active(), "extra")
30173015

30183016
def on_pacman_toggle4(self, widget, active):
3019-
if not pmf.repo_exist("[community-testing]"):
3017+
if not pmf.repo_exist("[extra-testing]"):
30203018
pmf.append_repo(self, fn.arch_community_testing_repo)
30213019
print("Repo has been added to /etc/pacman.conf")
30223020
fn.show_in_app_notification(self, "Repo has been added to /etc/pacman.conf")
30233021
else:
30243022
if self.opened is False:
3025-
pmf.toggle_test_repos(self, widget.get_active(), "community-testing")
3023+
pmf.toggle_test_repos(self, widget.get_active(), "extra-testing")
30263024

30273025
def on_pacman_toggle5(self, widget, active):
3028-
if not pmf.repo_exist("[community]"):
3029-
pmf.append_repo(self, fn.arch_community_repo)
3026+
if not pmf.repo_exist("[extra-testing]"):
3027+
pmf.append_repo(self, fn.arch_extra_testing_repo)
30303028
print("Repo has been added to /etc/pacman.conf")
30313029
GLib.idle_add(
30323030
fn.show_in_app_notification,

‎usr/share/archlinux-tweak-tool/data/eos/pacman/pacman.conf‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ HoldPkg = pacman glibc
1919
#XferCommand = /usr/bin/curl -L -C - -f -o %o %u
2020
#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
2121
#CleanMethod = KeepInstalled
22-
#UseDelta = 0.7
2322
Architecture = auto
2423

2524
# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
@@ -36,7 +35,6 @@ ILoveCandy
3635
#NoProgressBar
3736
#CheckSpace
3837
VerbosePkgLists
39-
DisableDownloadTimeout
4038
ParallelDownloads = 5
4139

4240
# By default, pacman accepts packages signed by keys that its local keyring
@@ -76,19 +74,16 @@ LocalFileSigLevel = Optional
7674
SigLevel = PackageRequired
7775
Include = /etc/pacman.d/endeavouros-mirrorlist
7876

79-
#[testing]
77+
#[core-testing]
8078
#Include = /etc/pacman.d/mirrorlist
8179

8280
[core]
8381
Include = /etc/pacman.d/mirrorlist
8482

85-
[extra]
86-
Include = /etc/pacman.d/mirrorlist
87-
88-
#[community-testing]
83+
#[extra-testing]
8984
#Include = /etc/pacman.d/mirrorlist
9085

91-
[community]
86+
[extra]
9287
Include = /etc/pacman.d/mirrorlist
9388

9489
# If you want to run 32 bit applications on your x86_64 system,

‎usr/share/archlinux-tweak-tool/functions.py‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@
181181
SigLevel = Optional TrustAll\n\
182182
Include = /etc/pacman.d/xero-mirrorlist"
183183

184-
arch_testing_repo = "[testing]\n\
184+
arch_testing_repo = "[core-testing]\n\
185185
Include = /etc/pacman.d/mirrorlist"
186186

187187
arch_core_repo = "[core]\n\
@@ -190,10 +190,7 @@
190190
arch_extra_repo = "[extra]\n\
191191
Include = /etc/pacman.d/mirrorlist"
192192

193-
arch_community_testing_repo = "[community-testing]\n\
194-
Include = /etc/pacman.d/mirrorlist"
195-
196-
arch_community_repo = "[community]\n\
193+
arch_extra_testing_repo = "[extra-testing]\n\
197194
Include = /etc/pacman.d/mirrorlist"
198195

199196
arch_multilib_testing_repo = "[multilib-testing]\n\

‎usr/share/archlinux-tweak-tool/pacman_functions.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -191,15 +191,15 @@ def toggle_test_repos(self, state, widget):
191191
pacman_on("[arcolinux_repo_xlarge]", lines, i, line)
192192

193193
if widget == "testing":
194-
pacman_on("[testing]", lines, i, line)
194+
pacman_on("[core-testing]", lines, i, line)
195195
if widget == "core":
196196
pacman_on("[core]", lines, i, line)
197197
if widget == "extra":
198198
pacman_on("[extra]", lines, i, line)
199199
if widget == "community-testing":
200-
pacman_on("[community-testing]", lines, i, line)
200+
pacman_on("[extra-testing]", lines, i, line)
201201
if widget == "community":
202-
pacman_on("[community]", lines, i, line)
202+
pacman_on("[extra-testing]", lines, i, line)
203203
if widget == "multilib-testing":
204204
pacman_on("[multilib-testing]", lines, i, line)
205205
if widget == "multilib":
@@ -247,15 +247,15 @@ def toggle_test_repos(self, state, widget):
247247
pacman_off("[arcolinux_repo_xlarge]", lines, i, line)
248248

249249
if widget == "testing":
250-
pacman_off("[testing]", lines, i, line)
250+
pacman_off("[core-testing]", lines, i, line)
251251
if widget == "core":
252252
pacman_off("[core]", lines, i, line)
253253
if widget == "extra":
254254
pacman_off("[extra]", lines, i, line)
255255
if widget == "community-testing":
256-
pacman_off("[community-testing]", lines, i, line)
256+
pacman_off("[extra-testing]", lines, i, line)
257257
if widget == "community":
258-
pacman_off("[community]", lines, i, line)
258+
pacman_off("[extra-testing]", lines, i, line)
259259
if widget == "multilib-testing":
260260
pacman_off("[multilib-testing]", lines, i, line)
261261
if widget == "multilib":

‎usr/share/archlinux-tweak-tool/pacman_gui.py‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -108,13 +108,18 @@ def gui(self, Gtk, vboxstack1, fn):
108108
self.checkbutton2 = Gtk.Switch()
109109
self.checkbutton2.connect("notify::active", self.on_pacman_toggle1)
110110
label3 = Gtk.Label(xalign=0)
111-
label3.set_markup("# Enable Arch Linux testing repo")
111+
label3.set_markup("# Enable Arch Linux core testing repo")
112112

113113
self.checkbutton6 = Gtk.Switch()
114114
self.checkbutton6.connect("notify::active", self.on_pacman_toggle2)
115115
label13 = Gtk.Label(xalign=0)
116116
label13.set_markup("Enable Arch Linux core repo")
117117

118+
self.checkbutton5 = Gtk.Switch()
119+
self.checkbutton5.connect("notify::active", self.on_pacman_toggle5)
120+
label12 = Gtk.Label(xalign=0)
121+
label12.set_markup("#Enable Arch Linux extra-testing repo")
122+
118123
self.checkbutton7 = Gtk.Switch()
119124
self.checkbutton7.connect("notify::active", self.on_pacman_toggle3)
120125
label14 = Gtk.Label(xalign=0)
@@ -123,12 +128,7 @@ def gui(self, Gtk, vboxstack1, fn):
123128
self.checkbutton4 = Gtk.Switch()
124129
self.checkbutton4.connect("notify::active", self.on_pacman_toggle4)
125130
label10 = Gtk.Label(xalign=0)
126-
label10.set_markup("# Enable Arch Linux community testing repo")
127-
128-
self.checkbutton5 = Gtk.Switch()
129-
self.checkbutton5.connect("notify::active", self.on_pacman_toggle5)
130-
label12 = Gtk.Label(xalign=0)
131-
label12.set_markup("Enable Arch Linux community repo")
131+
label10.set_markup("# Enable Arch Linux core testing repo")
132132

133133
self.checkbutton3 = Gtk.Switch()
134134
self.checkbutton3.connect("notify::active", self.on_pacman_toggle6)
@@ -229,6 +229,8 @@ def gui(self, Gtk, vboxstack1, fn):
229229
# TESTING REPOS PACKING
230230
# ========================================================
231231

232+
hboxstack14.pack_start(label12, False, True, 10)
233+
hboxstack14.pack_end(self.checkbutton5, False, False, 10)
232234
hboxstack5.pack_start(label3, False, True, 10)
233235
hboxstack5.pack_end(self.checkbutton2, False, False, 10)
234236
hboxstack15.pack_start(label13, False, True, 10)
@@ -237,8 +239,6 @@ def gui(self, Gtk, vboxstack1, fn):
237239
hboxstack16.pack_end(self.checkbutton7, False, False, 10)
238240
hboxstack12.pack_start(label10, False, True, 10)
239241
hboxstack12.pack_end(self.checkbutton4, False, False, 10)
240-
hboxstack14.pack_start(label12, False, True, 10)
241-
hboxstack14.pack_end(self.checkbutton5, False, False, 10)
242242
hboxstack6.pack_start(label4, False, True, 10)
243243
hboxstack6.pack_end(self.checkbutton3, False, False, 10)
244244
hboxstack17.pack_start(label15, False, True, 10)
@@ -314,9 +314,9 @@ def gui(self, Gtk, vboxstack1, fn):
314314
vbox = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=10)
315315
vbox.pack_start(hboxstack5, False, False, 0)
316316
vbox.pack_start(hboxstack15, False, False, 0)
317-
vbox.pack_start(hboxstack16, False, False, 0)
318-
vbox.pack_start(hboxstack12, False, False, 0)
319317
vbox.pack_start(hboxstack14, False, False, 0)
318+
vbox.pack_start(hboxstack16, False, False, 0)
319+
# vbox.pack_start(hboxstack12, False, False, 0)
320320
vbox.pack_start(hboxstack6, False, False, 0)
321321
vbox.pack_start(hboxstack17, False, False, 0)
322322
frame.add(vbox)

0 commit comments

Comments
 (0)