Various small fixes

* Append `.old` to old web directory instead of moving to `/tmp`
* Do not give the user a choice of install location
* Better detection of Debian version
* List username and password in Quick Start instructions
This commit is contained in:
Joe Haig
2017-01-27 09:21:53 +00:00
parent 265b6e5af0
commit bfb635636b
2 changed files with 15 additions and 11 deletions

View File

@@ -1,13 +1,13 @@
raspap_dir="/etc/raspap"
raspap_user="www-data"
version=`cat /etc/debian_version`
version=`sed 's/\..*//' /etc/debian_version`
# Determine version and set default home location for lighttpd
if [ $version == "8.0" ]; then
echo "Raspian verison is 8.0 Jessie"
if [ $version -ge 8 ]; then
echo "Raspian verison is 8.0 or later"
webroot_dir="/var/www/html"
elif [ $version == "7.8" ]; then
echo "Raspian version is 7.8 Wheezy"
elif; then
echo "Raspian version is earlier than 8.0"
webroot_dir="/var/www"
fi
@@ -27,11 +27,13 @@ function install_error() {
function config_installation() {
install_log "Configure installation"
echo -n "Install directory [${raspap_dir}]: "
read input
if [ ! -z "$input" ]; then
raspap_dir="$input"
fi
# This causes confusion. For the moment fix the default.
#echo -n "Install directory [${raspap_dir}]: "
#read input
#if [ ! -z "$input" ]; then
# raspap_dir="$input"
#fi
echo "Install directory: ${raspap_dir}"
echo -n "Complete installation with these values? [y/N]: "
read answer
@@ -75,7 +77,7 @@ function create_raspap_directories() {
# Fetches latest files from github to webroot
function download_latest_files() {
if [ -d "$webroot_dir" ]; then
sudo mv $webroot_dir /tmp/old_webroot || install_error "Unable to remove old webroot directory"
sudo mv $webroot_dir $webroot.old || install_error "Unable to remove old webroot directory"
fi
install_log "Cloning latest files from github"