Skip to content

minor fixes #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
folti wants to merge 3 commits into
base: master
Choose a base branch
from
Open

minor fixes #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bb284f6
mad: handle if the script is symlinked
Jul 7, 2014
d4fc506
mad: get() matches the keyword properly
Jul 7, 2014
423e2fd
Some style for links
pepellou Jun 25, 2014
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
19 changes: 14 additions & 5 deletions bin/mad
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,13 @@
VERSION="0.4.1"
REMOTE=git://github.com/visionmedia/mad-pages.git
REMOTE_MAD=git://github.com/visionmedia/mad.git
CONFIG=$(dirname $0)/../etc/mad.conf

BINPATH=$0
if [ -h "$BINPATH" ]; then
BINPATH=$(readlink "$BINPATH")
fi
MAD_ROOT=$(dirname "$BINPATH")
CONFIG=${MAD_ROOT}/../etc/mad.conf
MAD_CONFIG=${MAD_CONFIG:-$CONFIG}

#
Expand Down Expand Up @@ -36,7 +42,7 @@ list_pages() {
display() {
IFS=":"
local page=$1
local paths=".:$MAD_PATH:$(dirname $0)/../share/mad:/usr/share/mad"
local paths=".:$MAD_PATH:${MAD_ROOT}/../share/mad:/usr/share/mad"

for path in $paths; do
local file=$path/$page
Expand All @@ -58,7 +64,7 @@ display() {
#

get() {
grep "$1" "$MAD_CONFIG" | awk '{ print $2 }'
grep "^$1:" "$MAD_CONFIG" | awk '{ print $2 }'
}

#
Expand All @@ -76,6 +82,8 @@ display_from_stdin() {
display_file() {
local heading=$(get heading)
local code=$(get code)
local link=$(get link)
local url=$(get url)
local strong=$(get strong)
local em=$(get em)

Expand All @@ -87,6 +95,7 @@ display_file() {
s|\*(.+?)\*|\e[$em\1\e[0m|g; \
s|_(.+?)_|\e[$em\1\e[0m|g; \
s| (.+)| \e[$code\1\e[0m|g; \
s|\[(.+)\]\((.+)\)|\e[$em\e[$link\1\e[0m \e[$url(\2)\e[0m|g; \
s|<(.+?)>||g; \
s|^| |;" \
| less -R
Expand All @@ -98,7 +107,7 @@ display_file() {
#

display_mad_usage() {
display_file $(dirname $0)/../share/mad/mad.md
display_file ${MAD_ROOT}/../share/mad/mad.md
exit
}

Expand All @@ -107,7 +116,7 @@ display_mad_usage() {
#

install_all_remote() {
local path=$(dirname $0)/../share/mad
local path=${MAD_ROOT}/../share/mad
echo
echo " ... cloning repo"
cd /tmp && rm -fr mad-pages
Expand Down
2 changes: 2 additions & 0 deletions etc/mad.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,5 @@ heading: 1m
code: 90m
strong: 1m
em: 4m
link: 4;34;48m
url: 90m