Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions bin/,gitlog
Original file line number Diff line number Diff line change
Expand Up @@ -564,9 +564,9 @@ EOF
}

index_inc() {
_oldindex="$index"
if [ "$index" -lt $((log_height - 1)) ] \
&& [ $((index + 1)) -lt "$(line_count "$lines")" ]; then
_oldindex="$index"
_i=0
while IFS= read -r _line; do
if [ $_i -gt "$index" ]; then
Expand All @@ -583,11 +583,11 @@ index_inc() {
done <<EOF
$lines
EOF
if [ "$index" = "$_oldindex" ]; then
# shellcheck disable=SC2015
forward_page \
&& set_state action=index_inc_forward_page || true
fi
fi
if [ "$index" = "$_oldindex" ]; then
# shellcheck disable=SC2015
forward_page \
&& set_state action=index_inc_forward_page || true
fi
}

Expand Down
8 changes: 6 additions & 2 deletions test/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,12 @@ set -o errexit

TESTMODE="on"

src="$(echo "${BASH_SOURCE[0]}" | grep . || echo "$0")"
DIR="$(cd "$(dirname "$src")"; pwd)"
src=$(echo "${BASH_SOURCE[0]}" | grep . || echo "$0")
DIR=$(dirname -- "$src")
DIR=$(cd -- "$DIR"; pwd)

bin=$(cd -- "$DIR"; cd ../bin/; pwd)
export PATH="$PATH:$bin"

bash "$DIR/photosort/photosort-test.sh"
source "$DIR/test_add_aliases.sh"
Expand Down
Loading