Merge branch 'lukeshu/cleanup' into lukeshu/xbs

# Conflicts:
#	abslibre
#	config
#	cron-jobs/repo-sanity-check
#	db-remove
#	db-sync.conf

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
diff --git a/db-remove b/db-remove
index 05b1750..f761f22 100755
--- a/db-remove
+++ b/db-remove
@@ -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