Skip to content
This repository was archived by the owner on Apr 26, 2026. It is now read-only.

Commit 68e4ff2

Browse files
authored
breaking: use [etc
* breaking: use /etc | fix: correct only when distance is less than 5 * breaking: use /etc * breaking: use /etc * breaking: use /etc * breaking: use /etc * breaking: use /etc * Update lspkgs.py * breaking: use /etc * breaking: use /etc * breaking: use /etc
1 parent b1c61cb commit 68e4ff2

10 files changed

Lines changed: 38 additions & 36 deletions

File tree

src/delete.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
import os
22
import sys
3+
34
from rich.console import Console
5+
46
from status import status
57
import umbrella.autocorrect_package as Autocorrect
68

@@ -11,10 +13,10 @@ def main(package):
1113
if autocorrected != package:
1214
package = autocorrected
1315

14-
if not os.path.exists(f"/home/{os.getlogin()}/.config/repro.car"):
16+
if not os.path.exists("/etc/repro.car"):
1517
status("No repro.car file. Creating", "warn")
16-
os.makedirs(f"/home/{os.getlogin()}/.config", exist_ok=True)
17-
open(f"/home/{os.getlogin()}/.config/repro.car", "w").close()
18+
os.makedirs("/etc/car", exist_ok=True)
19+
open("/etc/repro.car", "w").close()
1820
return False
1921

2022
with open(f"/home/{os.getlogin()}/.config/repro.car") as f:
@@ -28,7 +30,7 @@ def main(package):
2830
if i.startswith(package):
2931
repro = repro.replace(i, "")
3032

31-
with open(f"/home/{os.getlogin()}/.config/repro.car", "w") as f:
33+
with open("", "w") as f:
3234
f.write(repro)
3335

3436
status(f"Uninstalling {package}...", "info")

src/get_package_list.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
from status import status
2-
import os
32

43
def main(package):
5-
with open("/home/"+os.getlogin()+"/.config/car/packagelist", "r") as f:
4+
with open("/etc/car/packagelist", "r") as f:
65
packages = f.read()
76

87
packagelist = packages.splitlines()
@@ -13,4 +12,3 @@ def main(package):
1312
status("Package not found.", "error")
1413
print("Maybe you forgot to update your packagelist?")
1514
print(" car updatelist")
16-

src/hooks.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
1-
import os
21
import importlib.util
2+
import os
3+
34
import status
45

56
def post_inst(package):
67
status.status("Loading hooks")
78
print("(1/?) Loading hooks")
89

9-
hooks_file = f"/home/{os.getlogin()}/.config/car/post-inst-hooks"
10-
10+
hooks_file = f"/etc/car/post-inst-hooks"
11+
1112
if not os.path.exists(hooks_file):
1213
print(f"No hooks file found at {hooks_file}")
1314
return

src/init.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import os
2+
23
import updatelist
34

45
def main():
5-
user = os.getlogin()
6-
base_path = f"/home/{user}/.config/car"
6+
base_path = f"/etc/car"
77

88
print(f"Creating {base_path}/")
99
os.makedirs(f"{base_path}/hooks", exist_ok=True)

src/install.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
import importlib.util
33
from rich.console import Console
44
import sys
5+
56
from status import status
67
import mirrors
78
import hooks
@@ -44,7 +45,7 @@ def main(package, noconfirm=False):
4445
# main
4546
try:
4647
# save installed package
47-
repro_path = "/home/" + os.getlogin() + "/.config/repro.car"
48+
repro_path = "/etc/repro.car"
4849

4950
def read_installed_versions(path):
5051
versions = {}

src/lspkgs.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import os
22

33
def main():
4-
with open(f"/home/{os.getlogin()}/.config/repro.car", "r") as f:
4+
with open("/etc/repro.car", "r") as f:
55
repro = f.read()
66

77
alr_used = []

src/mirrors.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
from status import status
2+
23
import os
34
import subprocess
45
from concurrent.futures import ThreadPoolExecutor
56

67
try:
7-
with open("/home/" + os.getlogin() + "/.config/mirrors.car", "r") as f:
8+
with open("/etc/mirrors.car", "r") as f:
89
mirrors = f.read()
910
except Exception:
10-
with open("/home/" + os.getlogin() + "/.config/mirrors.car", "w") as f:
11+
with open("/etc/mirrors.car", "w") as f:
1112
f.write(""":main:
1213
install_script = https://raw.githubusercontent.com/redroselinux/car-binary-storage/main/
1314
packagelist = https://raw.githubusercontent.com/redroselinux/car/main/existing-packages.txt

src/umbrella/autocorrect_package.py

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,29 +12,31 @@
1212

1313
def levenshtein_distance(a, b):
1414
m, n = len(a), len(b)
15-
dp = [[0]*(n+1) for _ in range(m+1)]
16-
for i in range(m+1): dp[i][0] = i
17-
for j in range(n+1): dp[0][j] = j
18-
for i in range(1, m+1):
19-
for j in range(1, n+1):
20-
cost = 0 if a[i-1] == b[j-1] else 1
21-
dp[i][j] = min(dp[i-1][j]+1,
22-
dp[i][j-1]+1,
23-
dp[i-1][j-1]+cost)
15+
dp = [[0] * (n + 1) for _ in range(m + 1)]
16+
for i in range(m + 1):
17+
dp[i][0] = i
18+
for j in range(n + 1):
19+
dp[0][j] = j
20+
for i in range(1, m + 1):
21+
for j in range(1, n + 1):
22+
cost = 0 if a[i - 1] == b[j - 1] else 1
23+
dp[i][j] = min(dp[i - 1][j] + 1, dp[i][j - 1] + 1, dp[i - 1][j - 1] + cost)
2424
return dp[m][n]
2525

2626
def find_best_match(requested_name, packages):
2727
best_match = None
28-
min_dist = float('inf')
28+
min_dist = float("inf")
2929
for pkg in packages:
3030
dist = levenshtein_distance(requested_name, pkg)
3131
if dist < min_dist:
3232
min_dist = dist
3333
best_match = pkg
34+
if min_dist > 5:
35+
return requested_name
3436
return best_match
3537

3638
def main(package):
37-
with open("/home/"+os.getlogin()+"/.config/car/packagelist", "r") as f:
39+
with open("/etc/car/packagelist", "r") as f:
3840
pkgs = f.read().splitlines()
3941
install = find_best_match(package, pkgs)
4042
if install != package:

src/update.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
from status import status
22
import mirrors
3-
import os
43
import install
4+
5+
import os
56
import updatelist
67
from rich.console import Console
78

@@ -30,7 +31,7 @@ def main():
3031
versions = f.read()
3132
versions_full += versions + "\n"
3233

33-
with open(f"/home/{os.getlogin()}/.config/repro.car", "r") as f:
34+
with open("/etc/repro.car", "r") as f:
3435
repro = f.read()
3536

3637
repo_versions = parse_versions(versions_full)

src/updatelist.py

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
import os
2-
from status import status
2+
33
import mirrors
44

55
def main():
66
os.chdir("/tmp")
7-
status("Updating lists...")
87
allpkgs = []
98

109
for i in mirrors.packagelist_places:
@@ -14,14 +13,11 @@ def main():
1413
with open("list", "r") as f:
1514
list = f.read().splitlines()
1615

17-
for i in list:
18-
print("found "+i)
19-
2016
allpkgs.extend(list)
2117

22-
with open("/home/"+os.getlogin()+"/.config/car/packagelist", "w") as f:
18+
with open("/etc/car/packagelist", "w") as f:
2319
f.write("")
2420

2521
for i in allpkgs:
26-
with open("/home/"+os.getlogin()+"/.config/car/packagelist", "a") as f:
22+
with open("/etc/car/packagelist", "a") as f:
2723
f.write(i+"\n")

0 commit comments

Comments
 (0)