mostly fixes for new error handling

[distro-setup] / ssh-emacs-setup

diff --git a/ssh-emacs-setup b/ssh-emacs-setup
index 80976f056df0eb22e1f135f42e4b6c4b180d6de6..65679fde3459fc7f6b833cfe52b70e99cf7573bb 100755 (executable)
--- a/ssh-emacs-setup
+++ b/ssh-emacs-setup
@@ -1,4 +1,4 @@
-#!/bin/bash -l
+#!/bin/bash
 # Copyright (C) 2016 Ian Kelling
 
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,6 +17,8 @@ if [[ $EUID != 0 ]]; then
     sudo "$0"
     exit
 fi
+if [[ -s ~/.bashrc ]];then . ~/.bashrc;fi
+
 
 set -eE -o pipefail
 trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?"' ERR