nav

commit e44d8f206732e5d7bbf0a667cff5275752290397

Author: Connor Etherington <[email protected]>

Date:   Wed May 17 00:58:26 2023 +0200

    Auto-Commit Update - 20230517

---

 PKGBUILD    |  2 +-

 usr/bin/nav | 18 +++++++++---------

 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/PKGBUILD b/PKGBUILD

index 8b2ab4a..790469c 100644

--- a/PKGBUILD

+++ b/PKGBUILD

@@ -1,7 +1,7 @@

 # Maintainer: Connor Etherington <[email protected]>

 # ---

 pkgname=nav

-pkgver=1.1

+pkgver=1.2

 pkgrel=1

 pkgdesc="A means of quick navigation through directories in the CLI"

 arch=(any)

diff --git a/usr/bin/nav b/usr/bin/nav

index 73b03da..b62afdc 100755

--- a/usr/bin/nav

+++ b/usr/bin/nav

@@ -9,7 +9,7 @@ PROD_DIR="${XDG_CONFIG_HOME:-$HOME/.config}/nav"

 CONFIG="${XDG_CONFIG_HOME:-$HOME/.config}/nav/config"

 MENU_DIRS_FILE="${PROD_DIR}/menuDirs"

-  

+

 GETPATH(){

   SELECT_PATH=$(dialog \

@@ -70,7 +70,7 @@ MAIN(){

       "SELECT") SELECTION=${PWD} ;;

       *) ! cd ${SELECT_PATH} && dialog --title "${TITLE}" --msgbox "\\n       Directory not found.\\n" 10 70 ;;

     esac

-  

+

   done

   while [[ -z ${ACT}  ]] ; do

@@ -79,17 +79,17 @@ MAIN(){

   [[ ${ACT} == 1 ]] && while [[ -z ${CMD} ]] ; do

     GETCMD && ISCORRECT "${SELECTION}" &&

-      ISCORRECT ${SELECTION} && cat ${CONFIG}|grep -q "^${CMD}=" && 

-      sed -i "s|alias ${CMD}=.*|alias ${CMD}='cd `realpath ${SELECTION}` ; ls -1a'|" ${CONFIG} ||

-      echo "alias ${CMD}='cd `realpath ${SELECTION}` ; ls -1a'" >> ${CONFIG}

+      ISCORRECT ${SELECTION} && cat ${CONFIG}|grep -q "^${CMD}=" &&

+      sed -i "s|alias ${CMD}=.*|alias ${CMD}='cd `realpath ${SELECTION}` ; which lfp >/dev/null 2>&1 && lfp || ls -1a'|" ${CONFIG} ||

+      echo "alias ${CMD}='cd `realpath ${SELECTION}` ; which lfp >/dev/null 2>&1 && lfp || ls -1a'" >> ${CONFIG}

     done

-  [[ ${ACT} == 0 ]] && ISCORRECTMENU "${SELECTION}" && 

+  [[ ${ACT} == 0 ]] && ISCORRECTMENU "${SELECTION}" &&

     echo `realpath ${SELECTION}` >> ${MENU_DIRS_FILE}

-  ${SHELL} 

+  ${SHELL}

-}  

+}

  # Script starts:

@@ -99,7 +99,7 @@ MAIN(){

 ! [ -f  ${CONFIG} ] && echo -e 'export NAV_INIT="initialized"

 navmenu(){ goto=$(cat ${XDG_CONFIG_HOME:-$HOME/.config}/nav/menuDirs|

-  uniq|fzf --preview "ls -1a {}");[[ -n ${goto} ]] && cd ${goto} && ls -1a\n}\n' > ${CONFIG}

+  uniq|fzf --preview "ls -1a {} | grep -v '^\.$' | grep -v '^\.\.$'");[[ -n ${goto} ]] && cd ${goto} && which lfp >/dev/null 2>&1 && !lfp && ls -1a || exit 0\n}\n' > ${CONFIG}

 INIT_CHECK && case $1 in

   '-m'|'--menu'|'m'|'menu') navmenu ;;