Update install log

This commit is contained in:
Rico Tiongson 2020-04-20 19:31:59 +08:00
parent 4509b57f8f
commit 759934e665

24
install
View File

@ -43,8 +43,9 @@ function uninstall_existing {
local PROGRAM="${1:?missing program name}" local PROGRAM="${1:?missing program name}"
# remove existing comfortable-swipe # remove existing comfortable-swipe
if [[ -x "$(command -v "$PROGRAM")" ]]; then if [[ -x "$(command -v "$PROGRAM")" ]]; then
echo "Removing existing $(which "$PROGRAM") ..." echo -n "Removing previous $(which "$PROGRAM") ... "
trysudo rm -f "$(which "$PROGRAM")" trysudo rm -f "$(which "$PROGRAM")"
echo "ok"
fi fi
} }
@ -140,17 +141,19 @@ function install_autostart {
} }
# install configuration files first but defer output later
# this is to ensure that the prompt runs first in the script
INSTALL_CONF_OUTPUT="$(install_configuration_file)"
# uninstall existing commands # uninstall existing commands
uninstall_existing comfortable-swipe uninstall_existing comfortable-swipe
uninstall_existing comfortable-swipe-buffer uninstall_existing comfortable-swipe-buffer
# run install # install new binaries
INSTALLED_CONF="$(install_configuration_file)"
echo "Installing binaries ..." echo "Installing binaries ..."
install_cpp_program install_cpp_program
install_main_program install_main_program
echo "$INSTALLED_CONF" echo "$INSTALL_CONF_OUTPUT"
install_autostart install_autostart
# add permissions to input group (defer) # add permissions to input group (defer)
@ -168,15 +171,14 @@ EOF
fi fi
cat <<EOF cat <<EOF
Autostart: $("$TARGET" autostart status)
Comfortable Swipe $VERSION
Autostart switched $("$TARGET" autostart status)
To edit your configuration file, run: To edit your configuration file, run:
gedit \$(comfortable-swipe config) gedit \$(comfortable-swipe config)
To start comfortable-swipe, run: Try running: comfortable-swipe start
installation successful
comfortable-swipe start
Successfully installed Comfortable Swipe $VERSION
EOF EOF