X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=setup.sh;h=91a527b7310e956f1cc737292fda7a9e2d57ff73;hb=ed31ed4ecd0475529d54a6c1d5f1cbfbd41d2a07;hp=f7c41b910ca7b87715b49dd9ca32ed22cb5ec90e;hpb=bfa7b63c0d29b2a1d12e34a1814b431d9c898cf5;p=config%2Fdotfiles.git

diff --git a/setup.sh b/setup.sh
index f7c41b9..91a527b 100755
--- a/setup.sh
+++ b/setup.sh
@@ -18,8 +18,11 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
+set -e
+
 . ../lib.sh
 
+
 if test x"`os`" = xdarwin; then
     # Sets a custom PATH for GUI applications.
     mkdir -p ~/.MacOSX
@@ -27,10 +30,12 @@ if test x"`os`" = xdarwin; then
 fi
 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
+    sed_i 's|^#|//|' debian/aptitude/config
 
     link debian/aptitude ~/.aptitude
-    link debian/reportbugrc ~/.reportbugrc
+    if installed reportbug; then
+        link debian/reportbugrc ~/.reportbugrc
+    fi
 fi