pull/58/head
Simon Let 6 years ago
parent 5cd1023e6e
commit f07dbaadea
  1. 19
      scripts/install.sh
  2. 6
      scripts/rawinstall.sh

@ -17,6 +17,7 @@ die() {
exit 1 exit 1
} }
echo
echo "Checking your system ..." echo "Checking your system ..."
# /usr/bin/zsh -> zsh # /usr/bin/zsh -> zsh
@ -25,7 +26,7 @@ login_shell=$(echo "$SHELL" | rev | cut -d'/' -f1 | rev)
if [ "$login_shell" != bash ] && [ "$login_shell" != zsh ]; then if [ "$login_shell" != bash ] && [ "$login_shell" != zsh ]; then
die "ERROR: Unsupported/unknown login shell: $login_shell" die "ERROR: Unsupported/unknown login shell: $login_shell"
fi fi
echo "Login shell: $login_shell - OK" echo " * Login shell: $login_shell - OK"
# check like we are not running bash # check like we are not running bash
@ -40,7 +41,7 @@ elif [ "$bash_version_major" -eq 4 ] && [ "$bash_version_minor" -lt 3 ]; then
fi fi
if [ "$bash_too_old" = true ]; then if [ "$bash_too_old" = true ]; then
echo "Bash version: $bash_version - UNSUPPORTED!" echo " * Bash version: $bash_version - UNSUPPORTED!"
if [ "$login_shell" = bash ]; then if [ "$login_shell" = bash ]; then
echo " > Your bash version is old." echo " > Your bash version is old."
echo " > Bash is also your login shell." echo " > Bash is also your login shell."
@ -51,17 +52,17 @@ if [ "$bash_too_old" = true ]; then
echo " > Updating to bash 4.3+ is recommended." echo " > Updating to bash 4.3+ is recommended."
fi fi
else else
echo "Bash version: $bash_version - OK" echo " * Bash version: $bash_version - OK"
fi fi
if ! zsh --version &>/dev/null; then if ! zsh --version &>/dev/null; then
echo "Zsh version: ? - not installed!" echo " * Zsh version: ? - not installed!"
else else
zsh_version=$(zsh -c 'echo ${ZSH_VERSION}') zsh_version=$(zsh -c 'echo ${ZSH_VERSION}')
zsh_version_major=$(echo "$zsh_version" | cut -d'.' -f1) zsh_version_major=$(echo "$zsh_version" | cut -d'.' -f1)
if [ "$zsh_version_major" -lt 5 ]; then if [ "$zsh_version_major" -lt 5 ]; then
echo "Zsh version: $zsh_version - UNSUPPORTED!" echo " * Zsh version: $zsh_version - UNSUPPORTED!"
if [ "$login_shell" = zsh ]; then if [ "$login_shell" = zsh ]; then
echo " > Your zsh version is old." echo " > Your zsh version is old."
echo " > Zsh is also your login shell." echo " > Zsh is also your login shell."
@ -72,7 +73,7 @@ else
echo " > Updating to zsh 5.0+ is recommended." echo " > Updating to zsh 5.0+ is recommended."
fi fi
else else
echo "Zsh version: $zsh_version - OK" echo " * Zsh version: $zsh_version - OK"
fi fi
fi fi
@ -143,9 +144,9 @@ fi
nohup resh-daemon &>/dev/null & disown nohup resh-daemon &>/dev/null & disown
# Generating resh-uuid ... # Generating resh-uuid ...
[ -e "$(HOME)/.resh/resh-uuid" ] \ [ -e ~/.resh/resh-uuid ] \
|| cat /proc/sys/kernel/random/uuid > "$(HOME)/.resh/resh-uuid" 2>/dev/null \ || cat /proc/sys/kernel/random/uuid > ~/.resh/resh-uuid 2>/dev/null \
|| scripts/uuid.sh > "$(HOME)/.resh/resh-uuid" 2>/dev/null || scripts/uuid.sh > ~/.resh/resh-uuid 2>/dev/null
echo "\ echo "\

@ -80,18 +80,14 @@ curl $curl_opt "$dl_binaries"
echo echo
echo "Checking integrity ..." echo "Checking integrity ..."
if [ "$(sha256sum "$fname_binaries")" != "$(grep "$fname_binaries" "$fname_checksums")" ]; then if [ "$(sha256sum "$fname_binaries")" != "$(grep "$fname_binaries" "$fname_checksums")" ]; then
echo "Error integrity check failed - exiting!" echo "ERROR: integrity check failed - exiting!"
exit 1 exit 1
fi fi
echo "OK"
echo echo
echo "Extracting downloaded files ..." echo "Extracting downloaded files ..."
tar -xzf "$fname_binaries" tar -xzf "$fname_binaries"
tree
echo "DONE"
echo
if ! scripts/install.sh; then if ! scripts/install.sh; then
if [ $? != 130 ]; then if [ $? != 130 ]; then

Loading…
Cancel
Save