fixup

3 files changed, 5 insertions, 3 deletions

diff --git a/.bashrc b/.bashrc
index 80bb8a2..feb522d 100644
--- a/.bashrc
+++ b/.bashrc
@@ -1,7 +1,7 @@
 # ~/.bashrc
 
 # If not running interactively, don't do anything
-# [[ $- != *i* ]] && return
+[[ $- != *i* ]] && return
 
 export PAGER=less
 export EDITOR=vim
@@ -18,6 +18,8 @@ stty -ixon # disable Ctrl-S
 # Save and reload the history after each command finishes
 #export PROMPT_COMMAND="history -a; history -c; history -r; $PROMPT_COMMAND"
 
+OS=${OS:-$(~/bin/os)}
+
 case $OS in
 (arch|alpine)
 	export GNUTERM='sixelgd enhanced truecolor font "arial,9"'
diff --git a/.profile b/.profile
index cdc28e3..d52b4f3 100644
--- a/.profile
+++ b/.profile
@@ -26,7 +26,7 @@ esac
 
 case $SHELL in
 (*/ash)  export ENV=~/.shrc ;;
-(*/bash) type -t p 2>/dev/null || . ~/.bashrc ;;
+(*/bash) type -t p >/dev/null || . ~/.bashrc ;;
 esac
 
 [ "$(tty)" = /dev/tty1 ] && [ -x /usr/bin/sway ] && exec dbus-run-session -- sway || true
diff --git a/bin/os b/bin/os
index 6287a25..db5f6ae 100755
--- a/bin/os
+++ b/bin/os
@@ -2,6 +2,6 @@
 
 # Print operating system name
 
-[ -f /etc/os-release ] && . /etc/os-release && exec echo "$ID"
+[ -e /etc/os-release ] && . /etc/os-release && exec echo "$ID"
 [ -d /data/data/com.termux ] && exec echo termux
 exec uname