Merge pull request #154 from TylerBarnes/fix/nvim-appname

fix: install/sync with NVIM_APPNAME

Author: shaunsingh

bin/nyoom

@@ -3,11 +3,29 @@
 set -o errexit -o pipefail -o nounset
 
 # people like xdg
-CONFIG_PATH="${XDG_CONFIG_HOME:-${HOME}/.config}/${NVIM_APPNAME:-nvim}"
-CACHE_PATH="${XDG_CACHE_HOME:-${HOME}/.cache}/${NVIM_APPNAME:-nvim}"
-DATA_PATH="${XDG_DATA_HOME:-${HOME}/.local/share}/${NVIM_APPNAME:-nvim}"
+NVIM_APPNAME="${NVIM_APPNAME:-nvim}"
+CONFIG_PATH="${XDG_CONFIG_HOME:-${HOME}/.config}/${NVIM_APPNAME}"
+CACHE_PATH="${XDG_CACHE_HOME:-${HOME}/.cache}/${NVIM_APPNAME}"
+DATA_PATH="${XDG_DATA_HOME:-${HOME}/.local/share}/${NVIM_APPNAME}"
 NYOOM_CONFIG="${XDG_DATA_HOME:-${HOME}/.config}/nyoom"
 
+NYOOM_CURRENT_DIR_REAL=$(realpath "$(pwd)")
+NYOOM_BASENAME=$(basename "$NYOOM_CURRENT_DIR_REAL")
+
+if [[ "$NYOOM_CURRENT_DIR_REAL" != "$CONFIG_PATH" ]]; then
+	echo "The directory you're running bin/nyoom ${1:-} in is not the expected location.";
+	echo
+	read -p "Set NVIM_APPNAME=${NYOOM_BASENAME} before continuing?  " -n 1 -r;
+	if [[ $REPLY =~ ^[Yy]$ ]]; then
+		NVIM_APPNAME=$NYOOM_BASENAME
+	else
+		echo "";
+		echo "Please clone Nyoom to ~/.config/nvim or run this command as 'NVIM_APPNAME=${NYOOM_BASENAME} bin/nyoom ${1:-}'"
+		exit;
+	fi
+
+fi
+
 mkdir -p "$CONFIG_PATH" "$CACHE_PATH" "$DATA_PATH" "$NYOOM_CONFIG"
 
 # silently enter ${CONFIG_PATH} when updating
@@ -77,7 +95,7 @@ sync)
 	rm -f "${CONFIG_PATH}/lua/packer_compiled.lua" || true
 	# set ulimit to fix packer.sync hanging with --headless: https://github.com/wbthomason/packer.nvim/issues/751
 	ulimit -S -n 4096
-	NYOOM_CLI=true nvim --headless -c 'autocmd User PackerComplete quitall' -c 'lua require("packer").sync()'
+	NYOOM_CLI=true NVIM_APPNAME=$NVIM_APPNAME nvim --headless -c 'autocmd User PackerComplete quitall' -c 'lua require("packer").sync()'
 	echo
 	if [ -d "${DATA_PATH}/site/pack/packer/opt/nvim-treesitter/" ]; then
 		echo