diff options
author | Luke Shumaker <lukeshu@sbcglobal.net> | 2015-05-25 01:36:39 -0600 |
---|---|---|
committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2015-05-25 01:36:39 -0600 |
commit | 34ec87b2afc83054af91d982f0b9b7447437c967 (patch) | |
tree | 10977822d0a8a168d6f5b45affff6f49e952f212 | |
parent | de1f6d3b16d6e833ec5df6e9f403aec7e2193962 (diff) | |
parent | d0834f7e6bd53ea729374eab138bb38a36c73996 (diff) |
Merge branch 'lukeshu/cleanup' into lukeshu/xbs
# Conflicts:
# abslibre
# config
# cron-jobs/repo-sanity-check
# db-remove
# db-sync.conf
-rwxr-xr-x | cron-jobs/check_archlinux/check_packages.py | 2 | ||||
-rwxr-xr-x | cron-jobs/make_repo_torrents | 2 | ||||
-rw-r--r-- | db-functions | 2 | ||||
-rwxr-xr-x | db-list-nonfree.py | 2 | ||||
-rwxr-xr-x | db-remove | 1 | ||||
-rwxr-xr-x | make_individual_torrent | 2 |
6 files changed, 6 insertions, 5 deletions
diff --git a/cron-jobs/check_archlinux/check_packages.py b/cron-jobs/check_archlinux/check_packages.py index d233bf6..ac0194f 100755 --- a/cron-jobs/check_archlinux/check_packages.py +++ b/cron-jobs/check_archlinux/check_packages.py @@ -1,4 +1,4 @@ -#!/usr/bin/python2 +#!/usr/bin/env python2 # # check_archlinux.py # diff --git a/cron-jobs/make_repo_torrents b/cron-jobs/make_repo_torrents index fc723f1..2eb0978 100755 --- a/cron-jobs/make_repo_torrents +++ b/cron-jobs/make_repo_torrents @@ -1,4 +1,4 @@ -#! /bin/bash +#!/bin/bash # Copyright (C) 2014 Joseph Graham <joseph@t67.eu> # # This program is free software: you can redistribute it and/or modify diff --git a/db-functions b/db-functions index d0c45a4..b0bdb28 100644 --- a/db-functions +++ b/db-functions @@ -1,4 +1,4 @@ -#!/bin/bash +#!/hint/bash # Some PKGBUILDs need CARCH to be set CARCH=$(. "$(librelib conf.sh)"; load_files makepkg; echo "$CARCH") diff --git a/db-list-nonfree.py b/db-list-nonfree.py index 4e1b164..a486fa5 100755 --- a/db-list-nonfree.py +++ b/db-list-nonfree.py @@ -1,4 +1,4 @@ -#! /usr/bin/python2 +#!/usr/bin/env python2 #-*- encoding: utf-8 -*- from filter import * import argparse @@ -29,6 +29,7 @@ done remove_pkgs=() for pkgbase in "${pkgbases[@]}"; do msg "Removing %s from [%s]..." "$pkgbase" "$repo" + path="$(xbs releasepath "$pkgbase" "$repo" "$arch")" if [ -d "$path" ]; then remove_pkgs+=($(. "$path/PKGBUILD"; echo "${pkgname[@]}")) diff --git a/make_individual_torrent b/make_individual_torrent index e5b7d8c..0a7e778 100755 --- a/make_individual_torrent +++ b/make_individual_torrent @@ -1,4 +1,4 @@ -#! /bin/bash +#!/bin/bash # Copyright (C) 2014 Joseph Graham <joseph@t67.eu> # # This program is free software: you can redistribute it and/or modify |