updates, especially for etiona

[distro-setup] / ssh-emacs-setup

diff --git a/ssh-emacs-setup b/ssh-emacs-setup
index 80976f056df0eb22e1f135f42e4b6c4b180d6de6..ff3e2d03fd90ce0a958ab5bc3e7fee2aad026e1f 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,12 +17,15 @@ 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
 
 cd $(dirname $0)
 teeu /etc/ssh/ssh_config 'SendEnv INSIDE_EMACS BRC COLUMNS'
+## note, duplicated in /a/bin/fai/fai/config/scripts/GRUB_PC/11-iank
 teeu /etc/ssh/sshd_config 'AcceptEnv INSIDE_EMACS BRC COLUMNS'
 # get rid of useless motd stuff
 sed -i --follow-symlinks 's/^\s*PrintLastLog .*/PrintLastLog no/' /etc/ssh/sshd_config