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

[config/dotfiles.git] / setup.sh

diff --git a/setup.sh b/setup.sh
index 81cca7656c7f01e28ce1b626ff18c33d045313e1..4055a84f6fe0d3c3ff11c680d1db1a5aed0b7d40 100755 (executable)
--- a/setup.sh
+++ b/setup.sh
@@ -18,19 +18,24 @@
 # 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