setup.sh: Use new generate() argument order.

[config/dotfiles.git] / setup.sh

diff --git a/setup.sh b/setup.sh
index ed385678d1d7ea579d7d3cb74701c44165b5b53d..4055a84f6fe0d3c3ff11c680d1db1a5aed0b7d40 100755 (executable)
--- a/setup.sh
+++ b/setup.sh
@@ -2,20 +2,40 @@
 
 # Setup script for OS related configuration files.
 
+# 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/>.
+
+
+set -e
 
 . ../lib.sh
 
-if [ x`os` = xdarwin ]; then
+
+if test x"`os`" = xdarwin; then
     # Sets a custom PATH for GUI applications.
     mkdir -p ~/.MacOSX
     link darwin/environment.plist ~/.MacOSX/environment.plist
 fi
-if [ x`os` = xdebian ]; then
+if test x"`os`" = xdebian; then
     # Necessary as aptitude rewrites the config file on every start.
-    generate cat debian/aptitude/config .real
+    generate debian/aptitude/config .in cat
     # aptitude/config uses // as comment instead of #.
     sed -i 's|^#|//|' debian/aptitude/config
 
     link debian/aptitude ~/.aptitude
-    link debian/reportbugrc ~/.reportbugrc
+    if installed reportbug; then
+        link debian/reportbugrc ~/.reportbugrc
+    fi
 fi