Mirror
/
shfm
mirror of https://github.com/dylanaraps/shfm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: Mirror:0.4.2
Branches Tags
Mirror:master
Mirror:0.4.2
Mirror:0.4.1
Mirror:0.4
Mirror:0.2
Mirror:0.1
...
compare: Mirror:master
Branches Tags
Mirror:master
Mirror:0.4.2
Mirror:0.4.1
Mirror:0.4
Mirror:0.2
Mirror:0.1

12 Commits
0.4.2 ... master

Author SHA1 Message Date
dylan 696318e947
Merge pull request #26 from Sketch98/bug0 
G keybind (end) wasn't setting $cur so it would open the wrong item.
 2021-06-11 08:13:38 +00:00
dylan 9a968b2c48
Merge pull request #27 from Sketch98/bug1 
fixed bug with search function. added double quotes to stop $ans from…
 2021-06-11 08:13:13 +00:00
dylan 25d4f809d7
Merge pull request #31 from Sketch98/bug2 
fixed bug when moving to parent...
 2021-06-11 08:11:35 +00:00
Nathan Sketch 01ae386143 fixed bug when moving to parent when y position of old directory equals bottom 2021-04-17 10:23:22 -04:00
Nathan Sketch 1bbd788ee0 this bug this branch was meant to fix was caused by word splitting. surrounding 
$ans in double quotes stopped that, but it also disabled globbing which is
desired. this commit switches to just disabling word splitting.
 2021-01-07 09:45:12 -05:00
Nathan Sketch 7b21d545b3 fixed bug with search function. added double quotes to stop $ans from parameter 
expanding and modified the logic for detecting an empty directory to stop it
from overriding the logic for displaying 'no results'.
 2021-01-07 06:19:46 -05:00
Nathan Sketch ec27f90096 G keybind (end) wasn't setting $cur so it would open the wrong item. 
line_print $y $@ always sets $cur correctly.
 2021-01-07 04:45:53 -05:00
Dylan Araps 8920178753
shfm: fix glob issues with hidden files 
Let's just allow '.' and '..' to appear in the list as
they are fully functional entries after all. Also removes
the need for a "no hidden files" message.
 2020-09-24 15:18:34 +03:00
dylan b8efa71b97
Merge pull request #20 from chambln/master 
Show '*' and '.[!.]*' if such files exist
 2020-09-24 13:54:22 +03:00
dylan e9fbd754ce
Merge pull request #22 from Crestwave/master 
added support for termux
 2020-09-24 13:47:22 +03:00
Crestwave 6849998609 added support for termux 2020-09-24 16:41:22 +08:00
Gregory Chamberlain 2a70030c02 Show '*' and '.[!.]*' if such files exist 2020-09-24 01:21:44 +01:00
1 changed files with 12 additions and 10 deletions
Show Stats Expand all files Collapse all files

22
shfm
View File

@ -121,7 +121,7 @@ hist_search() {
for file do
case ${PWD%%/}/$file in
"$old_pwd") y=$j y2=$((j > bottom ? mid : j)) cur=$file
"$old_pwd") y=$j y2=$((j >= bottom ? mid : j)) cur=$file
esac
j=$((j + 1))
@ -136,9 +136,8 @@ list_print() {
end=$((bottom + 1))
mid=$((bottom / 4 < 5 ? 1 : bottom / 4))
case $1$# in
'*1') set -- empty ;;
'.[!.]*1') set -- 'no hidden files'
case $# in
1) [ -e "$1" ] || [ "$1" = 'no results' ] || set -- empty
esac
case $hist in
@ -195,7 +194,7 @@ status_line() {
*) printf %s "$ltype"
esac
esc SGR
esc SGR 0 0
esc DECRC
}
@ -237,11 +236,11 @@ line_print() {
line_format() {
file_escape "$1"
esc EL0
[ -d "$1" ] && esc SGR 1 31
printf %s "$safe"
[ -d "$1" ] && printf /
esc SGR
esc SGR 0 0
esc EL0
printf '\r'
}
@ -326,13 +325,14 @@ main() {
G?)
y=$#
y2=$(($# < bottom ? $# : bottom))
line_print "$y" "$@"
redraw "$@"
;;
.?)
case ${hidden:=1} in
1) hidden=0; set -- .[!.]* ;;
*) hidden=1; set -- * ;;
1) hidden=0; set -- .* ;;
0) hidden=1; set -- *
esac
y=1 y2=1 cur=$1
@ -358,9 +358,11 @@ main() {
/?)
prompt / r
# word splitting and globbing intentional
IFS=
# globbing intentional, word splitting is disabled.
# shellcheck disable=2086
set -- $ans*
unset IFS
case $1$# in
"$ans*1") set -- 'no results'