From e485e67e0234ec54a61f2699fd0e77c0d6e0a5b5 Mon Sep 17 00:00:00 2001 From: P. J. McDermott Date: Sat, 22 Jul 2017 14:10:16 -0400 Subject: `git ls-files | xargs sed -i 's/\.sm/.sho/g'` --- diff --git a/.gitignore b/.gitignore index 3be0820..798ec5b 100644 --- a/.gitignore +++ b/.gitignore @@ -7,8 +7,8 @@ Session.vim # Generated files Makefile src/*[^.]?? -lib/*.sm -lib/*/*.sm +lib/*.sho +lib/*/*.sho man/*.? locale/*/*.ms pro-archman-*.tar.* diff --git a/Makefile.am b/Makefile.am index e11deb5..194394f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -36,8 +36,8 @@ pro_archman_LDADD = $(bin_sources) EXTRA_pro_archman_DEPENDENCIES = config.sh bin_SCRIPTS = $(bin_sources:.sh=) -pkgdata_SCRIPTS = $(pkgdata_sources:.sh=.sm) -pkgdatacmd_SCRIPTS = $(pkgdatacmd_sources:.sh=.sm) +pkgdata_SCRIPTS = $(pkgdata_sources:.sh=.sho) +pkgdatacmd_SCRIPTS = $(pkgdatacmd_sources:.sh=.sho) man1_MANS = $(man1_sources:.1in=.1) locale_MESSAGES = $(locale_sources:.sh=.ms) CLEANFILES = \ @@ -60,7 +60,7 @@ EXTRA_DIST = \ tools/shpp.sh \ tools/shld.sh -SUFFIXES = .sh .sm .1in .1 .ms +SUFFIXES = .sh .sho .1in .1 .ms textdomain = $$(printf '%s\n' '$(PACKAGE)' | sed -e 's|-|_|g') do_subst = sed \ @@ -129,7 +129,7 @@ dist-hook: $(AM_V_at)$(do_subst) $< >$@ $(AM_V_at)chmod a+x $@ -.sh.sm: +.sh.sho: $(AM_V_GEN)$(MKDIR_P) "$$(dirname $@)" $(AM_V_at)$(do_subst) $< >$@ diff --git a/src/cmd.sh b/src/cmd.sh index d05e7eb..fde5f60 100644 --- a/src/cmd.sh +++ b/src/cmd.sh @@ -31,7 +31,7 @@ load_cmds() for cmd in ${PKGLIBCMD}; do cmd="${cmd##*/}" - cmd="${cmd%.sm}" + cmd="${cmd%.sho}" cmds="${cmds}${cmd}${LF}" use "cmd/${cmd}" done @@ -76,7 +76,7 @@ print_cmd_summaries() padding="$(printf '%24s' '')" for cmd in ${PKGLIBCMD}; do cmd="${cmd##*/}" - cmd="${cmd%.sm}" + cmd="${cmd%.sho}" if [ ${#cmd} -gt 20 ]; then printf ' %s\n%24s' "${cmd}" '' else diff --git a/src/pro-archman.sh b/src/pro-archman.sh index 2a534b4..e17b751 100644 --- a/src/pro-archman.sh +++ b/src/pro-archman.sh @@ -69,8 +69,8 @@ use() dir="${default_dir}" fi - if [ -f "${dir}/${module##*/}.sm" ]; then - . "${dir}/${module##*/}.sm" + if [ -f "${dir}/${module##*/}.sho" ]; then + . "${dir}/${module##*/}.sho" else printf '%s: Error: Failed to load module "%s": %s\n' \ "${0##*/}" "${module}" 'no such file or directory' >&2 -- cgit v0.9.1