editenv

commit ad6625bcfa8ff5ad0dedfe6fcce77fa8551ba4bf

Author: Connor Etherington <[email protected]>

Date:   Sun Jul 2 10:36:25 2023 +0200

    Auto-Commit Update - 20230702

---

 PKGBUILD        |  2 +-

 usr/bin/editenv | 21 +++++++++------------

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

diff --git a/PKGBUILD b/PKGBUILD

index c7f0310..d90355b 100644

--- a/PKGBUILD

+++ b/PKGBUILD

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

 # Maintainer: Connor Etherington <[email protected]>

 # ---

 pkgname=editenv

-pkgver=0.2.1

+pkgver=0.2.2

 pkgrel=1

 pkgdesc="A simple command line tool for conveniently storing and editing environment variables."

 arch=(any)

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

index 82960c5..ecbcf5e 100755

--- a/usr/bin/editenv

+++ b/usr/bin/editenv

@@ -32,7 +32,7 @@ FZFPREVIEW="cat $ENTRIESFILE|grep {} | grep -q '#YESPREVIEW' &&

   echo {} | grep -q 'NEW VARIABLE' && echo -e '\n\e[1;32m[+] \e[37mCreate new environment variable\n\n\n\nEnvironment variables are used to store information that can be used by programs and scripts\n\n\nFor example, setting:\n\n$ \e[33mEDITOR=nvim\n\n\e[0mwill set the environment variable EDITOR to nvim\n\n\nThis can be used by other programs to determine which editor to use, or for any other purpose\n\n\nFor example, running:\n\n$ \e[33m\$EDITOR\n\ninstead of\n\n$ nvim\n\n\e[0mfrom your terminal\e[0m\n' && return 0 ||

   echo {} | grep -q 'NEW PATH' && echo -e '\n\e[1;32m[+] \e[37mAdd a new directory to your path\n\n\n\nExecutable files in this directory can be run from anywhere without needing to specify the absolute path\n\n\nFor example, running:\n\n$ \e[33meditenv\n\ninstead of\n\n$ /usr/bin/editenv\n\nfrom your terminal\e[0m\n' && return 0"

-trap "rm -f ${TMP}; eval $(source $ENTRIESFILE) >/dev/null 2>&1" EXIT QUIT STOP ERR

+trap "rm -f ${TMP}" EXIT QUIT STOP ERR

 # Functions:

@@ -45,9 +45,7 @@ NEWTYPE(){ echo -e '\e[36mNEW VARIABLE\nNEW PATH\e[0m' ; }

 SELECTHOLDER(){ awk -F= '{print $1}' ${1:-$ENTRIESFILE}|sed 's/\s*//;/^$/d;s/export //g'|sort -u|grep -v 'EDITENV_ISSOURCED'|grep -v 'EDITENV_PATHFILE' ; }

-FIRSTLOOP(){ [ -f $ENTRIESFILE ] && [ $(cat $ENTRIESFILE | grep -v 'EDITENV_ISSOURCED' | grep -v 'EDITENV_PATHFILE' | sed '/^$/d' | wc -l) -eq 0 ] && FIRST || return 0 ; }

-

-NOTSOURCEDLOOP(){ [[ -z $EDITENV_ISSOURCED ]] || [[ -z $EDITENV_PATHFILE ]] && NOTSOURCED ; return 0 ; }

+FIRSTLOOP(){ [[ -z $EDITENV_ISSOURCED ]] || [[ -z $EDITENV_PATHFILE ]] && NOTSOURCED  || [[ -f $ENTRIESFILE ]] && [[ $(cat $ENTRIESFILE | grep -v 'EDITENV_ISSOURCED' | grep -v 'EDITENV_PATHFILE' | sed '/^$/d' | wc -l) -eq 0 ]] && FIRST ; }

 FIRST(){ wasFirst=true ; dialog --title " ~ First Run ~ " --yesno "$NEWENTRY" 9 62 && NEW && return 0 || clear && err "Please add an entry to continue" ; }

@@ -60,15 +58,12 @@ NOTSOURCED(){

   entries="export EDITENV_ISSOURCED=true\nexport EDITENV_PATHFILE=${XDG_DATA_HOME:-$HOME/.local/share}/editenv/paths\nsource \$EDITENV_PATHFILE >/dev/null 2>&1\n$(cat $ENTRIESFILE|grep -v 'EDITENV_ISSOURCED'|grep -v 'EDITENV_PATHFILE')"

   echo -e "$entries" > $ENTRIESFILE ; dialog --title " ~ editenv ~ " --msgbox "$NOTSOURCED" 16 82 ;

-  echo -e "source ${XDG_DATA_HOME:-$HOME/.local/share}/editenv/entries" | xsel -ib ; FIRSTLOOP ;

+  echo -e "source ${XDG_DATA_HOME:-$HOME/.local/share}/editenv/entries" | xsel -ib

 }

 function NEW_ENTRY {

-  ! [ -d "${XDG_DATA_HOME:-$HOME/.local/share}/editenv" ] &&

-    mkdir -p "${XDG_DATA_HOME:-$HOME/.local/share}/editenv"

-

   dialog \

     --stdout --title " ~ NEW ENV VARIABLE ~ " \

     --form "\n                  Please fill in the required information :\n " 13 81 3 \

@@ -168,9 +163,13 @@ function DEL {

 function MAIN {

-  source $ENTRIESFILE >/dev/null 2>&1

+  ! [ -d "${XDG_DATA_HOME:-$HOME/.local/share}/editenv" ] && {

+    mkdir -p "${XDG_DATA_HOME:-$HOME/.local/share}/editenv"

+    touch ${ENTRIESFILE} && touch ${PATHFILE}

+  }

+

+  FIRSTLOOP

-  FIRSTLOOP && NOTSOURCEDLOOP && clear

   VALUE=$( PLACEHOLDER $1 |fzf \

     --ansi --no-sort --no-info \

@@ -205,8 +204,6 @@ function SELECT {

 # Script start:

 # ---

-trap "rm -f $TMP" EXIT QUIT

-

 case ${1} in

   '-a'|'-n'|'--add'|'--new') [[ -n $3 ]] && QUICKADD "$2" "$3" || NEW && exit 0 ;;

   '-c'|'-y'|'--copy'|'--yes') x="${@:2}"; COPYVAL "${x:-`SELECT "Select value to copy:"`}" "✅ Copied to clipboard" && exit 0 ;;