Skip to content

Commit

Permalink
Merge branch 'dev' of https://github.com/Dave9111/oref0 into open-prs
Browse files Browse the repository at this point in the history
  • Loading branch information
@scottleibrand
scottleibrand committed Feb 14, 2020
2 parents 0e670cc + d49f26c commit f9690b3
Show file tree
Hide file tree
Showing 3 changed files with 108 additions and 137 deletions.
215 changes: 105 additions & 110 deletions bin/oref0-log-shortcuts.sh
View file
Original file line number Diff line number Diff line change
@@ -1,102 +1,59 @@
#!/usr/bin/env bash

# Because this script is meant to be "source"d, not just run normally, it
# doesn't include oref0-bash-common-functions.sh like most others do.
#Maintain a standard list of convenience aliases in the ~/.bash_profile file.

myopenaps=${OPENAPS_DIR:-"$HOME/myopenaps"}
self="${BASH_SOURCE[0]}"

function usage ()
{
cat <<EOT
Usage: $(basename "$self") --add-to-profile=/path/to/.bash_profile
Usage: source "$(basename "$self")"
myopenaps=${OPENAPS_DIR:-"$HOME/myopenaps"}

Add aliases to .bash_profile or to the shell you source this from.
If run with the --add-to-profile=path option, modifies the file at the given
path (should be ~/.bash_profile) to include OpenAPS convenience aliases, if it
doesn't already. If evaluated with "source", adds those aliases to the
current shell environment instead.
EOT
}
PROFILE_PATH="$HOME/.bash_profile"

function do_aliases ()
{
alias networklog="tail -n 100 -F /var/log/openaps/network.log"
alias xdrip-looplog="tail -n 100 -F /var/log/openaps/xdrip-loop.log"
alias cgm-looplog="tail -n 100 -F /var/log/openaps/cgm-loop.log"
alias autosens-looplog="tail -n 100 -F /var/log/openaps/autosens-loop.log"
alias autotunelog="tail -n 100 -F /var/log/openaps/autotune.log"
alias pump-looplog="tail -n 100 -F /var/log/openaps/pump-loop.log"
alias urchin-looplog="tail -n 100 -F /var/log/openaps/urchin-loop.log"
alias ns-looplog="tail -n 100 -F /var/log/openaps/ns-loop.log"
alias cat-pref="cd ${myopenaps} && cat preferences.json"
alias edit-pref="cd ${myopenaps} && nano preferences.json"
alias cat-wifi="cat /etc/wpa_supplicant/wpa_supplicant.conf"
alias edit-wifi="vi /etc/wpa_supplicant/wpa_supplicant.conf"
alias cat-runagain="cd ${myopenaps} && cat oref0-runagain.sh"
alias edit-runagain="cd ${myopenaps} && nano oref0-runagain.sh"
alias cat-autotune="cd ${myopenaps}/autotune && cat autotune_recommendations.log"
alias git-branch="cd $HOME/src/oref0 && git branch"
alias runagain="bash ${myopenaps}/oref0-runagain.sh"
alias edison-battery="cd=${myopenaps}/monitor && cat edison-battery.json"
alias cat-reservoir="cd ${myopenaps}/monitor && cat reservoir.json"
alias stop-cron="cd ${myopenaps} && /etc/init.d/cron stop && killall -g oref0-pump-loop"
alias start-cron="/etc/init.d/cron start"
alias tz="sudo dpkg-reconfigure tzdata"
}

function add_aliases_to_profile ()
{
local PROFILE_PATH="$1"

remove_obsolete_aliases "$PROFILE_PATH"
function update_aliases_in_profile () {

local THIS_SCRIPT="$(readlink -f "$self")"
local SOURCE_THIS_SCRIPT="source \"$THIS_SCRIPT\""
if ! grep -q "$SOURCE_THIS_SCRIPT" "$PROFILE_PATH"; then
echo "$SOURCE_THIS_SCRIPT" >>"$PROFILE_PATH"
fi
remove_obsolete_aliases

#if they exist, remove current aliases to avoid multiple identical aliases in .bash_profile file on a repeat setup
remove_current_aliases

#add in the current aliases
add_current_aliases


# source default /etc/profile as well
if ! grep -q /etc/skel/.profile "$PROFILE_PATH"; then
echo "source /etc/skel/.profile" >> "$PROFILE_PATH"
fi
}

# In versions prior to 0.7.0, we individually added a bunch of aliases to the
# user's .bash_profile; in 0.7.0, we instead make the .bash_profile source a
# file that includes those aliases. For upgrading purposes, we want to remove
# user's .bash_profile; For upgrading purposes, we want to remove
# aliases that exactly match the ones that earlier versions added, but not
# aliases that have been modified.

function remove_obsolete_aliases () {
local PROFILE_PATH="$1"

# List of aliases that may have been added by previous versions of oref0.
# Some have multiple variants.
OBSOLETE_ALIASES=$(cat <<END
alias networklog="tail -n 100 -F /var/log/openaps/network.log"
alias xdrip-looplog="tail -n 100 -F /var/log/openaps/xdrip-loop.log"
alias cgm-looplog="tail -n 100 -F /var/log/openaps/cgm-loop.log"
alias autosens-looplog="tail -n 100 -F /var/log/openaps/autosens-loop.log"
alias autotunelog="tail -n 100 -F /var/log/openaps/autotune.log"
alias pump-looplog="tail -n 100 -F /var/log/openaps/pump-loop.log"
alias urchin-looplog="tail -n 100 -F /var/log/openaps/urchin-loop.log"
alias ns-looplog="tail -n 100 -F /var/log/openaps/ns-loop.log"
alias cat-pref="cd ${myopenaps} && cat preferences.json"
alias edit-pref="cd ${myopenaps} && nano preferences.json"
alias cat-wifi="cat /etc/wpa_supplicant/wpa_supplicant.conf"
alias edit-wifi="nano /etc/wpa_supplicant/wpa_supplicant.conf"
alias edit-wifi="vi /etc/wpa_supplicant/wpa_supplicant.conf"
alias cat-runagain="cd ${myopenaps} && cat oref0-runagain.sh"
alias edit-runagain="cd ${myopenaps} && nano oref0-runagain.sh"
alias cat-autotune="cd ${myopenaps}/autotune && cat autotune_recommendations.log"
alias git-branch="cd $HOME/src/oref0 && git branch"
alias runagain="bash ${myopenaps}/oref0-runagain.sh"
alias edison-battery="cd=${myopenaps}/monitor && cat edison-battery.json"
alias cat-reservoir="cd ${myopenaps}/monitor && cat reservoir.json"
alias stop-cron="cd ${myopenaps} && /etc/init.d/cron stop && killall -g oref0-pump-loop"
alias start-cron="/etc/init.d/cron start"
alias networklog="tail -n 100 -F /var/log/openaps/network.log"
alias xdrip-looplog="tail -n 100 -F /var/log/openaps/xdrip-loop.log"
alias cgm-looplog="tail -n 100 -F /var/log/openaps/cgm-loop.log"
alias autosens-looplog="tail -n 100 -F /var/log/openaps/autosens-loop.log"
alias autotunelog="tail -n 100 -F /var/log/openaps/autotune.log"
alias pump-looplog="tail -n 100 -F /var/log/openaps/pump-loop.log"
alias urchin-looplog="tail -n 100 -F /var/log/openaps/urchin-loop.log"
alias ns-looplog="tail -n 100 -F /var/log/openaps/ns-loop.log"
alias cat-pref="cd ${myopenaps} && cat preferences.json"
alias edit-pref="cd ${myopenaps} && nano preferences.json"
alias cat-wifi="cat /etc/wpa_supplicant/wpa_supplicant.conf"
alias edit-wifi="nano /etc/wpa_supplicant/wpa_supplicant.conf"
alias edit-wifi="vi /etc/wpa_supplicant/wpa_supplicant.conf"
alias cat-runagain="cd ${myopenaps} && cat oref0-runagain.sh"
alias edit-runagain="cd ${myopenaps} && nano oref0-runagain.sh"
alias cat-autotune="cd ${myopenaps}/autotune && cat autotune_recommendations.log"
alias git-branch="cd $HOME/src/oref0 && git branch"
alias runagain="bash ${myopenaps}/oref0-runagain.sh"
alias edison-battery="cd=${myopenaps}/monitor && cat edison-battery.json"
alias cat-reservoir="cd ${myopenaps}/monitor && cat reservoir.json"
alias stop-cron="cd ${myopenaps} && /etc/init.d/cron stop && killall -g oref0-pump-loop"
alias start-cron="/etc/init.d/cron start"
END
)
echo "$OBSOLETE_ALIASES" |(while read OBSOLETE_ALIAS; do
Expand All @@ -105,35 +62,73 @@ END
done)
}

case "$1" in
-h|--help|help)
usage
exit 0
;;
esac
#Remove the current aliases, if they exist, so they aren't added twice on a repeat setup.
#A brute force method to avoid duplications
function remove_current_aliases () {
CURRENT_ALIASES=$(cat <<END
alias networklog="tail -n 100 -F /var/log/openaps/network.log"
alias xdrip-looplog="tail -n 100 -F /var/log/openaps/xdrip-loop.log"
alias cgm-looplog="tail -n 100 -F /var/log/openaps/cgm-loop.log"
alias autosens-looplog="tail -n 100 -F /var/log/openaps/autosens-loop.log"
alias autotunelog="tail -n 100 -F /var/log/openaps/autotune.log"
alias pump-looplog="tail -n 100 -F /var/log/openaps/pump-loop.log"
alias urchin-looplog="tail -n 100 -F /var/log/openaps/urchin-loop.log"
alias ns-looplog="tail -n 100 -F /var/log/openaps/ns-loop.log"
alias cat-pref="cd ${myopenaps} && cat preferences.json"
alias edit-pref="cd ${myopenaps} && nano preferences.json"
alias cat-wifi="cat /etc/wpa_supplicant/wpa_supplicant.conf"
alias edit-wifi="nano /etc/wpa_supplicant/wpa_supplicant.conf"
alias cat-runagain="cd ${myopenaps} && cat oref0-runagain.sh"
alias edit-runagain="cd ${myopenaps} && nano oref0-runagain.sh"
alias cat-autotune="cd ${myopenaps}/autotune && cat autotune_recommendations.log"
alias git-branch="cd $HOME/src/oref0 && git branch"
alias runagain="bash ${myopenaps}/oref0-runagain.sh"
alias edison-battery="cd ${myopenaps}/monitor && cat edison-battery.json"
alias cat-reservoir="cd ${myopenaps}/monitor && cat reservoir.json"
alias stop-cron="cd ${myopenaps} && /etc/init.d/cron stop && killall -g oref0-pump-loop"
alias start-cron="/etc/init.d/cron start"
alias tz="sudo dpkg-reconfigure tzdata"
END
)

echo "$CURRENT_ALIASES" |(while read CURRENT_ALIAS; do
test -f "$PROFILE_PATH" && cat "$PROFILE_PATH" |grep -v "$CURRENT_ALIAS" >"$PROFILE_PATH".new$$ &&
mv -f "$PROFILE_PATH".new$$ "$PROFILE_PATH"
done)
}

function add_current_aliases () {
CURRENT_ALIASES1=$(cat <<END
alias networklog="tail -n 100 -F /var/log/openaps/network.log"
alias xdrip-looplog="tail -n 100 -F /var/log/openaps/xdrip-loop.log"
alias cgm-looplog="tail -n 100 -F /var/log/openaps/cgm-loop.log"
alias autosens-looplog="tail -n 100 -F /var/log/openaps/autosens-loop.log"
alias autotunelog="tail -n 100 -F /var/log/openaps/autotune.log"
alias pump-looplog="tail -n 100 -F /var/log/openaps/pump-loop.log"
alias urchin-looplog="tail -n 100 -F /var/log/openaps/urchin-loop.log"
alias ns-looplog="tail -n 100 -F /var/log/openaps/ns-loop.log"
alias cat-pref="cd ${myopenaps} && cat preferences.json"
alias edit-pref="cd ${myopenaps} && nano preferences.json"
alias cat-wifi="cat /etc/wpa_supplicant/wpa_supplicant.conf"
alias edit-wifi="nano /etc/wpa_supplicant/wpa_supplicant.conf"
alias cat-runagain="cd ${myopenaps} && cat oref0-runagain.sh"
alias edit-runagain="cd ${myopenaps} && nano oref0-runagain.sh"
alias cat-autotune="cd ${myopenaps}/autotune && cat autotune_recommendations.log"
alias git-branch="cd $HOME/src/oref0 && git branch"
alias runagain="bash ${myopenaps}/oref0-runagain.sh"
alias edison-battery="cd ${myopenaps}/monitor && cat edison-battery.json"
alias cat-reservoir="cd ${myopenaps}/monitor && cat reservoir.json"
alias stop-cron="cd ${myopenaps} && /etc/init.d/cron stop && killall -g oref0-pump-loop"
alias start-cron="/etc/init.d/cron start"
alias tz="sudo dpkg-reconfigure tzdata"
END
)
echo "$CURRENT_ALIASES1" >> "$PROFILE_PATH"
}

# Script was loaded with "source" (rather than regular execution)?
if [[ "${BASH_SOURCE[0]}" != "${0}" ]]; then
# Don't parse arguments, because the arguments in $@ belong to the parent
# script, not to us.
do_aliases
else
if [[ $# == 0 ]]; then
usage
exit 0
fi
for i in "$@"; do
case "$i" in
--add-to-profile)
test -f "$HOME/.bash_profile" && add_aliases_to_profile "$HOME/.bash_profile"
;;
--add-to-profile=*)
test -f "${i#*=}" && add_aliases_to_profile "${i#*=}"
;;
*)
echo "Unrecognized argument: $i"
exit 1
;;
esac
done
fi
# Do it!

update_aliases_in_profile

exit 0
5 changes: 3 additions & 2 deletions bin/oref0-setup.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1068,10 +1068,11 @@ if prompt_yn "" N; then
cd $directory || die "Can't cd $directory"
do_openaps_import $HOME/src/oref0/lib/oref0-setup/supermicrobolus.json

echo "Adding OpenAPS log shortcuts"
# Make sure that .bash_profile exists first, then call script to add the log shortcuts
touch "$HOME/.bash_profile"
oref0-log-shortcuts --add-to-profile="$HOME/.bash_profile"

echo "Adding OpenAPS log shortcuts"
oref0-log-shortcuts

# Append NIGHTSCOUT_HOST and API_SECRET to $HOME/.bash_profile so that openaps commands can be executed from the command line
#echo Add NIGHTSCOUT_HOST and API_SECRET to $HOME/.bash_profile
Expand Down
25 changes: 0 additions & 25 deletions tests/bash-util-functions.test.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -189,32 +189,7 @@ EOT
if [[ "$(source ./test_script_is_sourced.sh)" != "sourced" ]]; then
fail_test "script_is_sourced on sourced script"
fi

# Test oref0-log-shortcuts
cat >test_bash_profile <<EOT
This line doesn't get removed
The line below this should be removed
alias networklog="tail -n 100 -F /var/log/openaps/network.log"
The line above this should be removed
EOT
EXPECTED_NEW_PROFILE="$(cat <<EOT
This line doesn't get removed

The line below this should be removed
The line above this should be removed
source "$(readlink -f ../bin/oref0-log-shortcuts.sh)"
source /etc/skel/.profile
EOT
)"
../bin/oref0-log-shortcuts.sh --add-to-profile=./test_bash_profile
if [[ "$(cat test_bash_profile)" != "$(echo "$EXPECTED_NEW_PROFILE")" ]]; then
echo "Actual: $(cat test_bash_profile)"
echo "Expected: $(echo "$EXPECTED_NEW_PROFILE")"
fail_test "oref0-log-shortcuts did not modify test_bash_profile correctly"
fi
}

cleanup

0 comments on commit f9690b3

Please sign in to comment.