summarylogtreecommitdiffstats
path: root/update.py
diff options
context:
space:
mode:
authorchrisjbillington2020-02-22 12:21:53 -0500
committerchrisjbillington2020-02-22 12:21:53 -0500
commit93b826d06c6683e599b1e9b3a035d152be510340 (patch)
tree069ca5b24ffe87d1c92d36b899861c124684dd28 /update.py
parent4b5aa44fd537b461c4b9c5b8c8821b7c62366d85 (diff)
downloadaur-93b826d06c6683e599b1e9b3a035d152be510340.tar.gz
Fix update script
Diffstat (limited to 'update.py')
-rw-r--r--update.py17
1 files changed, 8 insertions, 9 deletions
diff --git a/update.py b/update.py
index 15209e192ea8..fbe172bc2d7f 100644
--- a/update.py
+++ b/update.py
@@ -8,25 +8,24 @@ url = "https://www.archlinux.org/packages/core/x86_64/linux-lts/json/"
data = subprocess.check_output(['curl', '-s', url]).decode()
info = json.loads(data)
-latest_kernver, latest_archver = info['pkgver'].rsplit('.', 1)
+latest_pkgver = info['pkgver']
latest_pkgrel = info['pkgrel']
-kernver, archver, pkgrel = subprocess.check_output(
- ['bash', '-c', 'source PKGBUILD; echo ${_kernver} ${_archver} ${_pkgrel}']
+pkgver, pkgrel = subprocess.check_output(
+ ['bash', '-c', 'source PKGBUILD; echo ${_pkgver} ${_pkgrel}']
).decode('utf8').strip().split()
-if (kernver, archver, pkgrel) != (latest_kernver, latest_archver, latest_pkgrel):
+if (pkgver, pkgrel) != (latest_pkgver, latest_pkgrel):
print("linux-lts-versioned-bin out of date!")
with open('PKGBUILD') as f:
pkgbuild = f.read()
replacements = (
- (f'_kernver={kernver}', f'_kernver={latest_kernver}'),
- (f'_archver={archver}', f'_archver={latest_archver}'),
+ (f'_kernver={pkgver}', f'_kernver={latest_pkgver}'),
(f'_pkgrel={pkgrel}', f'_pkgrel={latest_pkgrel}'),
(
- f'{kernver}.{archver}-{pkgrel}',
- f'{latest_kernver}.{latest_archver}-{latest_pkgrel}',
+ f'{pkgver}-{pkgrel}',
+ f'{latest_pkgver}-{latest_pkgrel}',
),
)
@@ -43,7 +42,7 @@ if (kernver, archver, pkgrel) != (latest_kernver, latest_archver, latest_pkgrel)
subprocess.check_call(['git', 'add', 'PKGBUILD', '.SRCINFO'])
subprocess.check_call(
- ['git', 'commit', '-m', f'{latest_kernver}.{latest_archver}-{latest_pkgrel}']
+ ['git', 'commit', '-m', f'{latest_pkgver}-{latest_pkgrel}']
)
def yn_choice(message, default='y'):