rearrange code to remove redundancies

master
KatolaZ 6 years ago
parent 22a92b1d44
commit 3f4090d1dd
  1. 25
      gophed

@ -36,10 +36,10 @@ fi
if [ "$1" = "-h" ]; then usage; fi if [ "$1" = "-h" ]; then usage; fi
if [ "$1" = "-i" ]; then if [ "$0" = "gophed" -a "$1" = "-i" ]; then
ln -s $0 g ln -sf $0 g
ln -s $0 d ln -sf $0 d
ln -s $0 v ln -sf $0 v
exit 0 exit 0
fi fi
@ -50,26 +50,33 @@ if [ "${script_name}" = "gophed" -o "${script_name}" = "v" ]; then
TMPFILE=$(mktemp /tmp/gophed_$2_${sel}_$3.XXXXXXXXXXXXXXXXXXX) TMPFILE=$(mktemp /tmp/gophed_$2_${sel}_$3.XXXXXXXXXXXXXXXXXXX)
go "$1" "$2" "$3" > $TMPFILE go "$1" "$2" "$3" > $TMPFILE
cat $SHOW - | ed -p ${PROMPT} $TMPFILE cat $SHOW - | ed -p ${PROMPT} $TMPFILE
cleanup
exit 0
fi fi
if [ "${script_name}" = "g" ]; then
if [ ${script_name} = "g" -o ${script_name} = "d" ]; then
LINE=$(awk "{if (NR == $2) print \$0;}" $1) LINE=$(awk "{if (NR == $2) print \$0;}" $1)
RESOURCE=$(echo "$LINE" | cut -d ' ' -f 2) RESOURCE=$(echo "$LINE" | cut -d ' ' -f 2)
HOST=$(echo "$LINE" | cut -d ' ' -f 3) HOST=$(echo "$LINE" | cut -d ' ' -f 3)
PORT=$(echo "$LINE" | awk -F ' ' '{ match($4,/[[:digit:]]+/); print substr($4,RSTART,RLENGTH) }') PORT=$(echo "$LINE" | awk -F ' ' '{ match($4,/[[:digit:]]+/); print substr($4,RSTART,RLENGTH) }')
if [ "${script_name}" = "g" ]; then
SEL=$(echo $RESOURCE | sed -r 's:/:+:g') SEL=$(echo $RESOURCE | sed -r 's:/:+:g')
TMPFILE=$(mktemp /tmp/gophed_${HOST}_${SEL}_${PORT}.XXXXXXXXXXXXXXXXXXX) TMPFILE=$(mktemp /tmp/gophed_${HOST}_${SEL}_${PORT}.XXXXXXXXXXXXXXXXXXX)
go "$RESOURCE" "$HOST" "$PORT" > $TMPFILE go "$RESOURCE" "$HOST" "$PORT" > $TMPFILE
cat $SHOW - | ed -p ${PROMPT} $TMPFILE cat $SHOW - | ed -p ${PROMPT} $TMPFILE
fi fi
if [ "${script_name}" = "d" ]; then if [ "${script_name}" = "d" ]; then
LINE=$(awk "{if (NR == $2) print \$0;}" $1)
RESOURCE=$(echo "$LINE" | cut -d ' ' -f 2)
HOST=$(echo "$LINE" | cut -d ' ' -f 3)
PORT=$(echo "$LINE" | awk -F ' ' '{ match($4,/[[:digit:]]+/); print substr($4,RSTART,RLENGTH) }')
DIR_RESOURCE=$(dirname $RESOURCE) DIR_RESOURCE=$(dirname $RESOURCE)
echo "Download $RESOURCE in ${HOST}${RESOURCE}" echo "Download $RESOURCE in ${HOST}${RESOURCE}"
mkdir -p "$HOST/$DIR_RESOURCE" mkdir -p "$HOST/$DIR_RESOURCE"
go "$RESOURCE" "$HOST" "$PORT" > "${HOST}${RESOURCE}" go "$RESOURCE" "$HOST" "$PORT" > "${HOST}${RESOURCE}"
fi fi
cleanup
exit 0
fi
echo "${scriptname}: command not found"
cleanup cleanup
exit 1

Loading…
Cancel
Save