Browse Source

Clean up install

Nathaniel van Diepen 3 years ago
parent
commit
ce20cd5321
4 changed files with 12 additions and 11 deletions
  1. 2 0
      Archlinux/.gitignore
  2. 2 9
      Archlinux/PKGBUILD
  3. 4 2
      pacman_repo/__main__.py
  4. 4 0
      pacman_repo/command_line.py

+ 2 - 0
Archlinux/.gitignore

@@ -3,3 +3,5 @@ pkg/
 src/
 *.tar.gz
 *.tar.gz.sig
+*.tar.xz
+*.tar.xz.sig

+ 2 - 9
Archlinux/PKGBUILD

@@ -1,5 +1,5 @@
 pkgname=pacman-repo
-pkgver=r3.4985117
+pkgver=r4.b23a9b9
 pkgver() {
     cd "$srcdir/$pkgname";
     printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
@@ -19,18 +19,11 @@ build() {
     nuitka3 \
         --show-progress \
         --follow-imports \
-        --include-package=pacman_repo \
-        --module pacman_repo
-    nuitka3 \
-        --show-progress \
-        --follow-imports \
+        --include-module pacman_repo \
         pacman_repo/command_line.py
-        # --remove-output \
-        # -o pacman-repo \
 }
 package() {
     cd "$srcdir/$pkgname";
     install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
     install -D command_line.bin "$pkgdir/usr/bin/pacman-repo"
-    install -D pacman_repo.so "$pkgdir/usr/lib/python3.8/site-packages/pacman_repo.so"
 }

+ 4 - 2
pacman_repo/__main__.py

@@ -1,6 +1,8 @@
 #!/usr/bin/env python
 import sys
 
-from . import main as pacman_repo
+from .command_line import main
 
-pacman_repo(sys.argv[1:])
+
+if __name__ == '__main__':
+    main(sys.argv[1:])

+ 4 - 0
pacman_repo/command_line.py

@@ -5,3 +5,7 @@ import sys
 
 def main():
     pacman_repo.main(sys.argv[1:])
+
+
+if __name__ == '__main__':
+    main()