diff --git a/install.sh b/install.sh index 2bf724b..30fb9ba 100755 --- a/install.sh +++ b/install.sh @@ -9,7 +9,6 @@ set -o errexit set -o nounset DOTDIR="/var/lib/dotfiles" -_SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" os_release_file=/etc/os-release if [[ ! -e "${os_release_file}" ]] ; then @@ -69,22 +68,4 @@ fi [[ -e './.git' ]] && git submodule update --init -if [[ "$(readlink "${_SCRIPT_DIR}")" != "${DOTDIR}" ]] && [[ "${_SCRIPT_DIR}" != "${DOTDIR}" ]] ; then - if [[ -e "${DOTDIR}" ]] ; then - 2>&1 printf "${DOTDIR} already exists. This seems unsafe.\n" - exit 1 - fi - printf "Moving directory to $DOTDIR ...\n" - sudo="" - if (( $(id -u ) != 0 )) ; then - sudo=sudo - fi - $sudo mv --no-target-directory "${_SCRIPT_DIR}" "${DOTDIR}" - printf "Done\n" -else - printf "Already working in ${DOTDIR}, nothing to do\n" -fi - -cd "${DOTDIR}" - cd "${DOTDIR}" && make diff --git a/install_scripts/neptune.sh b/install_scripts/neptune.sh index 89f2943..5f350d2 100755 --- a/install_scripts/neptune.sh +++ b/install_scripts/neptune.sh @@ -125,7 +125,6 @@ if /var/lib/dotfiles/install.sh ; then reboot fi EOF - CHROOTSCRIPT chmod +x /mnt/chroot-script.sh