Fix typo in lr

`diralias` allows you to map a symbolic name to an absolute path.

`j` takes an alias name, and jumps (cd) to it.

Makefile

@@ -1,6 +1,3 @@
-BINDIR?=${HOME}/.local/bin
-cmds=g pick
-fns=diralias j jmod nsalias
+fns=diralias j jmod lr tcat
 install:
 	install ${fns} $${FPATH:?FPATH not defined}
-	install ${cmds} ${BINDIR}

diralias

@@ -1,9 +1,9 @@
 function diralias
 {
-	typeset -i i=0
-
+	typeset -i i
 	case $# in
 	0)
+		let i=0
 		while (( i < ${#DIRALIASNAM[@]} ))
 		do
 			printf "%s\t%s\n" ${DIRALIASNAM[i]} "${DIRALIASVAL[i]}"
@@ -11,6 +11,7 @@ function diralias
 		done
 		;;
 	1)
+		let i=0
 		while [[ $i -lt ${#DIRALIASNAM[@]} && $1 != ${DIRALIASNAM[i]} ]]
 		do
 			let i++
@@ -18,6 +19,7 @@ function diralias
 		(( i == ${#DIRALIASNAM[@]} )) && print $1 || print ${DIRALIASVAL[i]}
 		;;
 	2)
+		let i=0
 		while [[ $i -lt ${#DIRALIASNAM[@]} && $1 != ${DIRALIASNAM[i]} ]]
 		do
 			let i++

g

@@ -1,19 +0,0 @@
-#!/usr/bin/env ksh
-if [[ $1 = "pc" || ( $1 = "pr" && $2 = "create" ) ]]
-then
-	tmp=$(mktemp /tmp/g.XXXXXXXXXXX.md)
-	if [[ -f ~/.g.template ]]
-	then
-		lps=$(git show --pretty='format:%s' --no-patch | cut -d' ' -f1)
-		if [[ ! -z $lps ]]
-		then
-			url="https://issues.liferay.com/browse/"$lps
-			sed -e "s/{lps}/$lps/g" -e "s,{url},$url," <~/.g.template >$tmp
-		fi
-	fi
-	${GH_EDITOR:-${VISUAL:-${EDITOR:-ed}}} ${tmp} >/dev/null
-	gh $@ --title "$(head -1 $tmp)" --body "$(tail -n +3 $tmp)"
-	mv -f $tmp /tmp/g.lastpr
-else
-	gh $@
-fi

jmod

@@ -1,26 +1,15 @@
 function jmod
 {
-	typeset dir root sel
-	typeset -a dirs names
-	typeset -i i=0
-
 	(( $# != 1 )) && return 64
-	root=$(jr && pwd)/modules/apps
-	set -A dirs $(find $root -maxdepth 2 -mindepth 2 -type d -iregex ".*/[^/]*$1[^/]*" | sort)
-	(( ${#dirs[@]} == 0 )) && return 1
-	for dir in ${dirs[@]}
-	do
-		names[$i]=${dir##*/}
-		let i++
-	done
-	if (( ${#names[@]} > 1 ))
+	typeset m=$(jr && pwd)/modules/apps
+	typeset d=$(find $m -maxdepth 2 -mindepth 2 -type d -iregex ".*/.*$1$")
+	[[ -z $d ]] && return 1
+	if (( $(print $d | wc -w) > 1 ))
 	then
-		select sel in ${names[@]}
+		select d in $d
 		do
-			print ${sel} && cd ${dirs[(( REPLY - 1 ))]}
-			break;
+			break
 		done
-	else
-		print ${names[0]} && cd ${dirs[0]}
 	fi
+	print ${d##*/} && cd $d
 }

kpick

@@ -1,8 +0,0 @@
-#!/usr/bin/env ksh
-(( $# == 0 )) && exit 64
-(( $# == 1 )) && echo $1 && exit 0
-select choice in "$@"
-do
-	print $choice
-	break
-done

lr

@@ -0,0 +1,26 @@
+function lr
+{
+	(( $# != 1 )) && return 64
+	case $1 in
+	all)
+		(jr && ant all)
+		;;
+	bl)
+		(jr && cd modules/apps/portal-language/portal-language-lang && gw buildLang)
+		;;
+	kill)
+		pkill -9 -f Liferay
+		psql -c 'drop schema ce cascade;' -c 'create schema authorization ce;' postgres postgres
+		(jr && rm -rf ../bundles/data && rm -rf ../bundles/osgi/state)
+		;;
+	killdaemon)
+		pkill -9 -f gradle
+		;;
+	sf|fs)
+		(jr && cd portal-impl && ant format-source)
+		;;
+	*)
+		return 64
+		;;
+	esac
+}

nsalias

@@ -1,32 +0,0 @@
-function nsalias {
-	typeset -i i=0
-
-	case $# in
-	0|1)
-		while (( i < ${#NSCMDNS[@]} ))
-		do
-			[[ ( -z $1 ) || ( ${NSCMDNS[i]} = $1 ) ]] \
-				&& print -c "${NSCMDNS[i]}\t${NSCMDFN[i]}\t${NSCMDSH[i]}"
-			let i++
-		done
-		;;
-	2)
-		while [[ $i -lt ${#NSCMDNS[@]} &&  ( ${NSCMDNS[i]} != $1 || ${NSCMDFN[i]} != $2 ) ]]
-		do
-			let i++
-		done
-		(( i == ${#NSCMDNS[@]} )) && return 1
-		eval "${NSCMDSH[i]}"
-		;;
-	3)
-		(( $# != 3 )) && return 64
-		NSCMDNS[${#NSCMDNS[@]}]=$1
-		NSCMDFN[${#NSCMDFN[@]}]=$2
-		NSCMDSH[${#NSCMDSH[@]}]=$3
-		! alias $1 >/dev/null && alias $1="nsalias $1"
-		;;
-	*)
-		return 64
-		;;
-	esac
-}

tcat

@@ -0,0 +1,20 @@
+function tcat
+{
+	(( $# != 1 )) && return 64
+	case $1 in
+	log)
+		(jr && less ../bundles/tomcat-*/logs/catalina.out)
+		;;
+	start)
+		pgrep -f tomcat && return 1
+		(jr && ../bundles/tomcat-*/bin/catalina.sh jpda start) >/dev/null
+		;;
+	stop)
+		pgrep -f tomcat || return 1
+		(jr && ../bundles/tomcat-*/bin/shutdown.sh) >/dev/null
+		;;
+	*)
+		return 64
+		;;
+	esac
+}