editenv


Logs | Files | README | README | LICENSE | GitLab

1
commit 069efb7c7341cb1641f6b4b0c964d39c2881bf74
2
Author: Connor Etherington <[email protected]>
3
Date:   Sat Jul 1 21:15:19 2023 +0200
4


5
    Auto-Commit Update - 20230701


6
---


7
 PKGBUILD        |  2 +-


8
 usr/bin/editenv | 68 ++++++++++++++++++++++++++++++++++++++++++++-------------


9
 2 files changed, 54 insertions(+), 16 deletions(-)


10


11
diff --git a/PKGBUILD b/PKGBUILD


12
index e519d93..9a26287 100644


13
--- a/PKGBUILD


14
+++ b/PKGBUILD


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


16
 # Maintainer: Connor Etherington <[email protected]>


17
 # ---


18
 pkgname=editenv


19
-pkgver=0.1.2


20
+pkgver=0.2.0


21
 pkgrel=1


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


23
 arch=(any)


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


25
index 0f4b396..af38e70 100755


26
--- a/usr/bin/editenv


27
+++ b/usr/bin/editenv


28
@@ -16,6 +16,8 @@ NOTSOURCED="\\nPlease NOTE: In order for editenv to work correctly, the entries


29
 


30
 ENTRIESFILE="${XDG_DATA_HOME:-$HOME/.local/share}/editenv/entries"


31
 


32
+PATHFILE="${XDG_DATA_HOME:-$HOME/.local/share}/editenv/paths"


33
+


34
 FZFPREVIEW="cat $ENTRIESFILE|grep {} | grep -q '#YESPREVIEW' &&


35
   cat $ENTRIESFILE | grep {}= | cut -d= -f2 | sed -r 's/\" #YESPREVIEW//;s/^\"//' | bat --style=numbers,grid --color=always && return 0 ||


36
   cat $ENTRIESFILE | grep {} | grep -q 'NOPREVIEW' &&  echo -e '\n\e[1;31m


37
@@ -25,24 +27,29 @@ FZFPREVIEW="cat $ENTRIESFILE|grep {} | grep -q '#YESPREVIEW' &&


38
     ▐   ▐ ▝▖ ▐   ▚▞  ▙▟  ▐  ▐


39
     ▐   ▐  ▘▗▟▄  ▐▌ ▐  ▌ ▐  ▐▄▄▖


40
 


41
-\e[0m ' && return 0 || echo {} | grep -q 'NEW ENTRY' && echo -e '\n\e[1;32m[+] \e[37mCreate new environment variable\e[0m\n'"


42
+\e[0m ' && return 0 ||


43
+  echo {} | grep -q 'NEW ENTRY' && echo -e '\n\e[1;32m[+] \e[37mCreate new environment variable, or add a new directory to your paths' && return 0 ||


44
+  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 ||


45
+  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"


46
 


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


48
 


49
 


50
 # Functions:


51
 


52
-err(){ echo -e "${*}" && exit 1 ; }


53
+err(){ clear && echo -e "\n[-] ${*}" && exit 1 ; }


54
+


55
+PLACEHOLDER(){ echo -e '\e[32mNEW ENTRY\e[0m' ; awk -F= '{print $1}' ${1:-$ENTRIESFILE}|sed 's/\s*//;/^$/d;s/export //g'|sort -u|grep -v 'EDITENV_ISSOURCED'|grep -v 'EDITENV_PATHFILE' ; }


56
 


57
-PLACEHOLDER(){ echo -e '\e[32mNEW ENTRY\e[0m' ; awk -F= '{print $1}' ${1:-$ENTRIESFILE}|sed 's/\s*//;/^$/d;s/export //g'|sort -u|grep -v 'EDITENV_ISSOURCED' ; }


58
+NEWTYPE(){ echo -e '\e[36mNEW VARIABLE\nNEW PATH\e[0m' ; }


59
 


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


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


62
 


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


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


65
 


66
-NOTSOURCEDLOOP(){ [[ -z $EDITENV_ISSOURCED ]] && NOTSOURCED ; }


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


68
 


69
-FIRST(){ wasFirst=true ; dialog --title " ~ First Run ~ " --yesno "$NEWENTRY" 9 62 && NEW && return 0 || clear && exit 1 ; }


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


71
 


72
 COPYVAL(){ cat $ENTRIESFILE | grep "${1}" | cut -d\" -f2 | cut -d# -f1 | xsel -ib && notify-send "${2}" ; }


73
 


74
@@ -50,23 +57,23 @@ QUICKADD(){ [[ -n $2 ]] && echo 'export '$1'="'$2'" #YESPREVIEW' >> $ENTRIESFILE


75
 


76
 NOTSOURCED(){


77
 


78
-  entries="export EDITENV_ISSOURCED=true\n$(cat $ENTRIESFILE|grep -v 'EDITENV_ISSOURCED')" ;


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


80
 


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


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


83
 


84
 }


85
 


86
-function NEW {


87
+function NEW_ENTRY {


88
 


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


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


91
 


92
   dialog \


93
-    --stdout --title " ~ NEW ENTRY ~ " \


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


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


96
     " Entry Name   :" 1 1 "" 1 16 59 0 \


97
-    " Entry Value  :" 2 1 "" 2 16 59 0  >${TMP} || exit 1


98
+    " Entry Value  :" 2 1 "" 2 16 59 0  >${TMP} || err "User exited"


99
 


100
   ENTRYNAME=$(head -n1 ${TMP} | tail -n1)


101
   ENTRYVALUE=$(head -n2 ${TMP} | tail -n1)


102
@@ -84,6 +91,39 @@ function NEW {


103
 


104
 }


105
 


106
+function NEW_PATH {


107
+


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


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


110
+


111
+  NEWPATH=$(dialog \


112
+    --stdout --title " ~ NEW PATH ~ " \


113
+    --inputbox "\n                  Please fill in the required information :\n " 13 81) || exit 1


114
+


115
+  [[ -n $NEWPATH ]] && {


116
+    [[ -f $NEWPATH ]] && err "\"$NEWPATH\" is a file, not a directory.\e[0m\n"


117
+    [[ -d $NEWPATH ]] && echo 'export PATH="$PATH:'$NEWPATH'"' >> ${PATHFILE} &&


118
+      notify-send "✅ Your Paths have been updated!" && exit 0 ; } || MAIN


119
+}


120
+


121
+function NEW {


122
+


123
+  VALUE=$( NEWTYPE $1 |fzf \


124
+    --ansi --no-sort --no-info \


125
+    --prompt="Select a new entry type: " \


126
+    --pointer=▶ --marker=✓ --cycle \


127
+    --color=fg:-1,bg:-1,hl:6,fg+:3,bg+:0,hl+:6 \


128
+    --height 100% --header " " \


129
+    --preview "${FZFPREVIEW}" \


130
+    --preview-window=70% ) || exit 1


131
+


132
+   [[ ${VALUE} == 'NEW VARIABLE' ]] && NEW_ENTRY


133
+   [[ ${VALUE} == 'NEW PATH' ]] && NEW_PATH


134
+


135
+}


136
+


137
+


138
+


139
 function EDITORDEL {


140
 


141
   dialog \


142
@@ -116,9 +156,7 @@ function EDIT {


143
 


144
 function DEL {


145
 


146
-  FIRSTLOOP && clear


147
-


148
-  cat $ENTRIESFILE | grep -q "${1}=" || err "\n[-] No variable exists with the name \"${1}\"";


149
+  cat $ENTRIESFILE | grep -q "${1}=" || err "No variable exists with the name \"${1}\"";


150
 


151
   dialog --stdout --title " ~ DELETE ENTRY ~ " \


152
     --yes-label "Delete" --no-label "Cancel" \


153
@@ -130,7 +168,7 @@ function DEL {


154
 


155
 function MAIN {


156
 


157
-  FIRSTLOOP && clear


158
+  FIRSTLOOP && NOTSOURCEDLOOP && clear


159
 


160
   VALUE=$( PLACEHOLDER $1 |fzf \


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