Rename all the things

- aur-install -> aur-build
- checkspace now needs no arguments

diff --git a/aur-install b/archpkg/aur-build
similarity index 95%
rename from aur-install
rename to archpkg/aur-build
index 6c5b5a2fd5cc65ce5ff72294aa25e751f922168c..bcb3b61d89cc8bae5bb72e7a6825bb3cc6f4ffdc 100755 (executable)
--- a/aur-install
+++ b/archpkg/aur-build
@@ -11,7 +11,7 @@ fi
 shift
 MAKEPKG_CMD=("$@")
 if [ ${#MAKEPKG_CMD[@]} -eq 0 ]; then
-    MAKEPKG_CMD=("makepkg" "-sri")
+    MAKEPKG_CMD=("makepkg" "-sr")
 fi
 
 function enter_directory {

diff --git a/archpkg/aur-buildx b/archpkg/aur-buildx
new file mode 100755 (executable)
index 0000000..090f3f7
--- /dev/null
+++ b/archpkg/aur-buildx
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+PKGNAME="$1"
+shift
+
+exec aur-build "$PKGNAME" makechrootpkgx "$@"

diff --git a/aur-check-updates b/archpkg/aur-check-updates
similarity index 100%
rename from aur-check-updates
rename to archpkg/aur-check-updates

diff --git a/makechrootpkgx b/archpkg/makechrootpkgx
similarity index 100%
rename from makechrootpkgx
rename to archpkg/makechrootpkgx

diff --git a/repo-ls b/archpkg/repo-ls
similarity index 100%
rename from repo-ls
rename to archpkg/repo-ls

diff --git a/repo-sign b/archpkg/repo-sign
similarity index 100%
rename from repo-sign
rename to archpkg/repo-sign

diff --git a/aur-installx b/aur-installx
deleted file mode 100755 (executable)
index d6af65d..0000000
--- a/aur-installx
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-PKGNAME="$1"
-shift
-
-exec aur-install "$PKGNAME" makechrootpkgx "$@"

diff --git a/aptorphan b/bin/aptorphan
similarity index 100%
rename from aptorphan
rename to bin/aptorphan

diff --git a/csv2txt b/bin/csv2txt
similarity index 100%
rename from csv2txt
rename to bin/csv2txt

diff --git a/dates b/bin/dates
similarity index 100%
rename from dates
rename to bin/dates

diff --git a/docker-cleanup b/bin/docker-cleanup
similarity index 100%
rename from docker-cleanup
rename to bin/docker-cleanup

diff --git a/find-services-to-restart b/bin/find-services-to-restart
similarity index 100%
rename from find-services-to-restart
rename to bin/find-services-to-restart

diff --git a/git-cleanup b/bin/git-cleanup
similarity index 100%
rename from git-cleanup
rename to bin/git-cleanup

diff --git a/java-decompile-recursive b/bin/java-decompile-recursive
similarity index 100%
rename from java-decompile-recursive
rename to bin/java-decompile-recursive

diff --git a/mfree b/bin/mfree
similarity index 100%
rename from mfree
rename to bin/mfree

diff --git a/pacorphan b/bin/pacorphan
similarity index 100%
rename from pacorphan
rename to bin/pacorphan

diff --git a/passphrasegen b/bin/passphrasegen
similarity index 100%
rename from passphrasegen
rename to bin/passphrasegen

diff --git a/passwdgen b/bin/passwdgen
similarity index 100%
rename from passwdgen
rename to bin/passwdgen

diff --git a/update-grub b/bin/update-grub
similarity index 100%
rename from update-grub
rename to bin/update-grub

diff --git a/wifi-scan b/bin/wifi-scan
similarity index 100%
rename from wifi-scan
rename to bin/wifi-scan

diff --git a/xmlpp b/bin/xmlpp
similarity index 100%
rename from xmlpp
rename to bin/xmlpp

diff --git a/apple-time-machine-symlink.py b/hacks/apple-time-machine-symlink.py
similarity index 100%
rename from apple-time-machine-symlink.py
rename to hacks/apple-time-machine-symlink.py

diff --git a/backup-mysql b/hacks/backup-mysql
similarity index 100%
rename from backup-mysql
rename to hacks/backup-mysql

diff --git a/bashttpd b/hacks/bashttpd
similarity index 100%
rename from bashttpd
rename to hacks/bashttpd

diff --git a/bin2ascii b/hacks/bin2ascii
similarity index 100%
rename from bin2ascii
rename to hacks/bin2ascii

diff --git a/bt-dun-connect b/hacks/bt-dun-connect
similarity index 100%
rename from bt-dun-connect
rename to hacks/bt-dun-connect

diff --git a/dnsctl b/hacks/dnsctl
similarity index 100%
rename from dnsctl
rename to hacks/dnsctl

diff --git a/find-in-file b/hacks/find-in-file
similarity index 100%
rename from find-in-file
rename to hacks/find-in-file

diff --git a/gnome-shell-raise-window b/hacks/gnome-shell-raise-window
similarity index 100%
rename from gnome-shell-raise-window
rename to hacks/gnome-shell-raise-window

diff --git a/lib-ext-backup b/hacks/lib-ext-backup
similarity index 100%
rename from lib-ext-backup
rename to hacks/lib-ext-backup

diff --git a/magnet b/hacks/magnet
similarity index 100%
rename from magnet
rename to hacks/magnet

diff --git a/make-persistent-journal b/hacks/make-persistent-journal
similarity index 100%
rename from make-persistent-journal
rename to hacks/make-persistent-journal

diff --git a/multiboot-setup b/hacks/multiboot-setup
similarity index 100%
rename from multiboot-setup
rename to hacks/multiboot-setup

diff --git a/opal-card-tool b/hacks/opal-card-tool
similarity index 100%
rename from opal-card-tool
rename to hacks/opal-card-tool

diff --git a/rename-by-date b/hacks/rename-by-date
similarity index 100%
rename from rename-by-date
rename to hacks/rename-by-date

diff --git a/rsync-ssh-backup b/hacks/rsync-ssh-backup
similarity index 100%
rename from rsync-ssh-backup
rename to hacks/rsync-ssh-backup

diff --git a/shaper b/hacks/shaper
similarity index 100%
rename from shaper
rename to hacks/shaper

diff --git a/smart-stats b/hacks/smart-stats
similarity index 100%
rename from smart-stats
rename to hacks/smart-stats

diff --git a/split-mvimg b/hacks/split-mvimg
similarity index 100%
rename from split-mvimg
rename to hacks/split-mvimg

diff --git a/ssh-screen-wrapper b/hacks/ssh-screen-wrapper
similarity index 100%
rename from ssh-screen-wrapper
rename to hacks/ssh-screen-wrapper

diff --git a/tcp-proxy b/hacks/tcp-proxy
similarity index 100%
rename from tcp-proxy
rename to hacks/tcp-proxy

diff --git a/terminal-color-table b/hacks/terminal-color-table
similarity index 100%
rename from terminal-color-table
rename to hacks/terminal-color-table

diff --git a/usb-reset b/hacks/usb-reset
similarity index 100%
rename from usb-reset
rename to hacks/usb-reset

diff --git a/wordpress-salt-gen b/hacks/wordpress-salt-gen
similarity index 100%
rename from wordpress-salt-gen
rename to hacks/wordpress-salt-gen

diff --git a/checkspace b/healthcheck/checkspace
similarity index 73%
rename from checkspace
rename to healthcheck/checkspace
index 061263a2f25371d3e9f396e67eb38797a43d2c9f..468b74917d79461a10acec635c8007dcdc3a4a2e 100755 (executable)
--- a/checkspace
+++ b/healthcheck/checkspace
@@ -27,12 +27,17 @@ def check_path(path):
     if warn:
         print("WARNING! %s has only %s remaining" % (path, pp_size(free)))
 
+def read_fstab():
+    for line in open("/etc/fstab"):
+        if line.startswith("#"):
+            continue
+        _, path, _ = line.split(maxsplit=2)
+        if path.startswith("/"):
+            yield path
 
 def main():
-    paths = sys.argv[1:]
-    if not paths:
-        print("Usage: %s path" % sys.argv[0])
-        sys.exit(1)
+    paths = set(["/"])
+    paths.update(read_fstab())
     for path in paths:
         check_path(path)