X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=lib.sh;h=5abd27898400e44bbaed2c14ec4a45ce80b8f480;hb=8348ecd5e6759f9551fac0431a45c3bdffc36956;hp=e1be32dc9d5ca45ed3a2868af8b4941674b1cc32;hpb=c619e7cce2a60f2d435a783ba607ea7b421170b7;p=config%2Fdotfiles.git

diff --git a/lib.sh b/lib.sh
index e1be32d..5abd278 100644
--- a/lib.sh
+++ b/lib.sh
@@ -2,16 +2,75 @@
 #
 # Their setup.sh script sources this file.
 
+# Copyright (C) 2009-2013  Simon Ruderich
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 
 # csh gives the error "Unknown colorls variable `su'." when used with newer
 # options supported by Zsh or GNU ls.
 unset LS_COLORS
 
 
-# Check if the given program is installed. Returns 0 if it exists, 1
-# otherwise; so it can be used in if.
+# Check if the given program is installed. `type` is portable, `which` is not.
 installed() {
-    which $1 2>&1 | perl -ne 'if (not m{^/}) { exit 1 }'
+    type "$1" >/dev/null 2>&1
+}
+# Get the path of the given program. Thanks to Gilles on [1] (read on
+# 2013-03-10) for the PATH-walking idea. `which` is not portable and `type`
+# has no well-formed output format.
+#
+# [1]: http://unix.stackexchange.com/questions/4988/how-do-i-test-to-see-if-an-application-exists-in-path/4991
+installed_path() {
+    test -z "$1" && return 1
+
+    # Keep IFS change local.
+    (
+        IFS=:
+        # Walk PATH.
+        for directory in $PATH; do
+            if test -x "$directory/$1"; then
+                echo "$directory/$1"
+                return 0
+            fi
+        done
+
+        return 1
+    )
+}
+
+# Usage: cmd_i <cmd> ... <file>
+#
+# Run <cmd> with all arguments (including the last file) and write the result
+# to the temporary file <file>.tmp and then renamed that file to <file>. This
+# can't be done in-place (e.g. cmd <file >file) because it truncates the file.
+cmd_i() {
+    # Get last argument.
+    last=
+    for x; do
+        last="$x"
+    done
+
+    "$@" >"$last".tmp
+    mv "$last".tmp "$last"
+}
+
+# Usage: sed_i ... <file>
+#
+# sed -i is not compatible due to different implementations. See cmd_i.
+sed_i() {
+    cmd_i sed "$@"
 }
 
 # Print the current OS. The following OS are supported at the moment:
@@ -19,16 +78,19 @@ installed() {
 # - Gentoo (gentoo)
 # - Mac OS X (darwin)
 # - Solaris/OpenSolaris (sun)
+# - FreeBSD (freebsd)
 # If an unsupported OS is used an error is printed.
 os() {
-    if [ -f /etc/debian_version ]; then
+    if test -f /etc/debian_version; then
         echo debian
-    elif [ -f /etc/gentoo-release ]; then
+    elif test -f /etc/gentoo-release; then
         echo gentoo
-    elif [ x`uname` = xDarwin ]; then
+    elif test x`uname` = xDarwin; then
         echo darwin
-    elif [ x`uname` = xSunOS ]; then
+    elif test x`uname` = xSunOS; then
         echo sun
+    elif test x`uname` = xFreeBSD; then
+        echo freebsd
     else
         echo unsupported OS! >&2
         return 1
@@ -41,9 +103,12 @@ os() {
 # `./link.sh example ~/.examplerc` creates a symbolic link to example
 # (wherever it is located) in ~/ named .examplerc.
 link() {
+    local pwd base source target >/dev/null 2>&1 || true
+
     # Get all necessary paths.
     pwd=`pwd`
-    base=`dirname "$2"`
+    base=`echo "$2" | sed "s|\~|$HOME|"` # expand ~, some sh don't do it
+    base=`dirname "$base"`
     source=`echo "$pwd/$1" | sed "s|$base/||"`
     target=`basename "$2"`
 
@@ -52,13 +117,14 @@ link() {
 
     # Abort if the target file exists and is no symbolic link. Prevents
     # overwriting real files.
-    if [ -e "$target" -a ! -h "$target" ]; then
+    if ( test -f "$target" && test ! -h "$target" ) || \
+            ( test -s "$target" && test ! -h "$target" ); then
         echo "link(): target '$target' exists already and is no symbolic link!" >&2
         exit 1
     fi
 
-    # Make sure the source exists.
-    if [ ! -e "$source" ]; then
+    # Make sure the source exists (is file, directory or link).
+    if test ! -f "$source" && test ! -d "$source" && test ! -h "$source"; then
         echo "link(): source '$source' doesn't exist!" >&2
         exit 1
     fi
@@ -70,8 +136,6 @@ link() {
 
     # Go back to the directory where we were before.
     cd "$pwd"
-
-    unset pwd base source target
 }
 
 # Write a warning to $1 to make clear it should not be modified. $2 is the
@@ -88,7 +152,7 @@ warning() {
     # Display given options if there were any (Zsh has a problem with $options
     # as variable name).
     option=
-    if [ -n "$4" ]; then
+    if test -n "$4"; then
         option=" with options '$4'"
     fi
     # Write message to stdout.
@@ -118,11 +182,11 @@ generate() {
 
     # Set extension for the used commands. When cat is used $3 is used as
     # extension.
-    if [ x"$command" = xm4 ]; then
+    if test x"$command" = xm4; then
         extension=.m4
-    elif [ x"$command" = xawk -o x"$command" = xperl ]; then
+    elif test x"$command" = xawk -o x"$command" = xperl; then
         extension=.in
-    elif [ x"$command" = xcat ]; then
+    elif test x"$command" = xcat; then
         extension="$1" # is $3 in reality, $1 because of shifting
         shift
     # Print a warning and exit if an unsupported command is used.