Merge pull request #3 from budlabs/next

re-added all the commandline options, oopsi

Author: budRich

Makefile GNUmakefile

@@ -1,49 +1,59 @@
-.PHONY: clean check all install uninstall \
-				install-dev uninstall-dev
+.PHONY: all install-dev uninstall-dev
 
 .ONESHELL:
-.DEFAULT_GOAL   := all
-
-SHELL           := /bin/bash
+.DEFAULT_GOAL       := all
 
+SHELL               := /bin/bash
 CUSTOM_TARGETS       =
 
-PREFIX              := /usr
 NAME                := $(notdir $(realpath .))
 VERSION             := 0
 UPDATED             := $(shell date +'%Y-%m-%d')
-CREATED             := $(UPDATED)
 AUTHOR              := anon
-CONTACT             := address
-ORGANISATION        :=
 CACHE_DIR           := .cache
 DOCS_DIR            := docs
 CONF_DIR            := conf
 AWK_DIR             := awklib
 FUNCS_DIR           := func
+FILE_EXT            := .sh
 INDENT              := $(shell echo -e "  ")
 USAGE                = $(NAME) [OPTIONS]
 OPTIONS_FILE        := options
-MANPAGE              = $(NAME).1
-MONOLITH             = _$(NAME).sh
-BASE                := _init.sh
+MONOLITH             = _$(NAME)$(FILE_EXT)
+BASE                := _init$(FILE_EXT)
 SHBANG              := \#!/bin/bash
 OPTIONS_ARRAY_NAME  := _o
-MANPAGE_OUT          = _$(MANPAGE)
 FUNC_STYLE          := "() {"
 
-ifneq ($(wildcard config.mak),)
+config_mak          := config.mak
+help_table          := $(CACHE_DIR)/help_table.txt
+long_help           := $(CACHE_DIR)/long_help.md
+getopt              := $(CACHE_DIR)/getopt
+print_help          := $(CACHE_DIR)/print_help$(FILE_EXT)
+print_version       := $(CACHE_DIR)/print_version$(FILE_EXT)
+
+ifneq ($(wildcard $(config_mak)),)
   include config.mak
+else
+  config_mak    :=
 endif
 
-manpage_section      = $(subst .,,$(suffix $(MANPAGE)))
-function_createconf := $(FUNCS_DIR)/_createconf.sh
-function_awklib     := $(FUNCS_DIR)/_awklib.sh
+ifeq ($(wildcard $(OPTIONS_FILE)),)
+  OPTIONS_FILE  :=
+  help_table    :=
+  long_help     :=
+  getopt        :=
+  print_help    :=
+  print_version :=
+endif
+
+function_createconf := $(FUNCS_DIR)/_createconf$(FILE_EXT)
+function_awklib     := $(FUNCS_DIR)/_awklib$(FILE_EXT)
 
 ifneq ($(wildcard $(CONF_DIR)/*),)
   include_createconf   = $(function_createconf)
-  conf_dirs            = $(shell find $(CONF_DIR) -type d)
-  conf_files           = $(shell find $(CONF_DIR) -type f)
+  conf_dirs            = $(patsubst ./%,%,$(shell find "./$(CONF_DIR)" -type d))
+  conf_files           = $(patsubst ./%,%,$(shell find "./$(CONF_DIR)" -type f))
 else
   $(shell rm -f $(function_createconf))
 endif
@@ -59,8 +69,9 @@ option_docs          = $(wildcard $(DOCS_DIR)/options/*)
 
 generated_functions := $(function_err) $(include_createconf) $(include_awklib)
 function_files := \
-	$(generated_functions) \
-	$(filter-out $(generated_functions),$(wildcard $(FUNCS_DIR)/*))
+  $(generated_functions) \
+  $(filter-out $(generated_functions),$(wildcard $(FUNCS_DIR)/*))
+
 
 # this hack writes 1 or 0 to the file .cache/got_func
 # depending on existence of files in FUNC_DIR
@@ -95,36 +106,35 @@ install-dev: $(BASE) $(NAME)
 uninstall-dev: $(PREFIX)/bin/$(NAME)
 	rm $^
 
-check: all
-	shellcheck $(MONOLITH)
-
-$(BASE): config.mak $(CACHE_DIR)/getopt $(CACHE_DIR)/print_help.sh $(CACHE_DIR)/print_version.sh $(CACHE_DIR)/got_func
+$(BASE): $(getopt) $(print_help) $(print_version) $(CACHE_DIR)/got_func
 	@$(info making $@)
 	{
 		printf '%s\n' '$(SHBANG)' '' 
 
-		grep -vhE -e '^#!/' $(CACHE_DIR)/print_version.sh | sed '0,/2/s//3/'
-		grep -vhE -e '^#!/' $(CACHE_DIR)/print_help.sh    | sed '0,/2/s//3/'
+		[[ -f $${pv:=$(print_version)} ]] \
+			&& grep -vhE -e '^#!/' $(print_version) | sed '0,/2/s//3/'
+		[[ -f $${ph:=$(print_help)} ]] \
+			&& grep -vhE -e '^#!/' $(print_help)    | sed '0,/2/s//3/'
 
 		echo
 
-		[[ -d $(FUNCS_DIR) ]] && {
+		[[ -d $${fd:=$(FUNCS_DIR)} ]] && {
 			printf '%s\n' \
 			'for ___f in "$$__dir/$(FUNCS_DIR)"/*; do' \
 			'$(INDENT). "$$___f" ; done ; unset -v ___f'
 		}
 
 		echo
 
-		cat $(CACHE_DIR)/getopt
+		[[ -f $${go:=$(getopt)} ]] && cat $(getopt)
 
 		echo "((BASHBUD_VERBOSE)) && _o[verbose]=1"
 		echo
 
 		echo 'main "$$@"'
 	} > $@
 
-$(MONOLITH): $(CACHE_DIR)/print_version.sh $(NAME) $(CACHE_DIR)/print_help.sh $(function_files) $(CACHE_DIR)/getopt
+$(MONOLITH): $(print_version) $(NAME) $(print_help) $(function_files) $(getopt)
 	@$(info making $@)
 	{
 		printf '%s\n' '$(SHBANG)' ''
@@ -141,29 +151,12 @@ $(MONOLITH): $(CACHE_DIR)/print_version.sh $(NAME) $(CACHE_DIR)/print_help.sh $(
 
 	chmod +x $@
 
-$(CACHE_DIR)/copyright.txt: config.mak
-	@$(info making $@)
-	year_created=$(CREATED) year_created=$${year_created%%-*}
-	year_updated=$$(date +'%Y')
-
-	copy_text="Copyright (c) "
-
-	((year_created == year_updated)) \
-		&& copy_text+=$$year_created   \
-		|| copy_text+="$${year_created}-$${year_updated}, $(AUTHOR)"
-
-	[[ $${org:=$(ORGANISATION)} ]] \
-		&& copy_text+=" of $(ORGANISATION)  "
-
-	printf '%s\n' \
-		"$$copy_text" "SPDX-License-Identifier: $(LICENSE)" > $@
-
 # if a file in docs/options contains more than
 # 2 lines, it will get added to the file .cache/long_help.md
 # like this:
 #   ### -s, --long-option ARG
 #   text in docs/options/long-option after the first 2 lines
-$(CACHE_DIR)/long_help.md: $(CACHE_DIR)/options_in_use $(option_docs)
+$(long_help): $(CACHE_DIR)/options_in_use $(option_docs)
 	@$(info making $@)
 	for option in $(file < $(CACHE_DIR)/options_in_use); do
 		[[ $$(wc -l < $(DOCS_DIR)/options/$$option) -lt 2 ]] \
@@ -179,7 +172,7 @@ $(CACHE_DIR)/synopsis.txt: $(OPTIONS_FILE) | $(CACHE_DIR)/
 	@$(info making $@)
 	sed 's/^/$(NAME) /g;s/*//g' $< > $@
 
-$(CACHE_DIR)/help_table.txt: $(CACHE_DIR)/long_help.md
+$(help_table): $(long_help)
 	@$(info making $@)
 	for option in $$(cat $(CACHE_DIR)/options_in_use); do
 		[[ -f $(CACHE_DIR)/options/$$option ]]  \
@@ -193,7 +186,7 @@ $(CACHE_DIR)/help_table.txt: $(CACHE_DIR)/long_help.md
 		paste <(echo "$$frag") <(echo "$$desc") | tr -d '\t'
 	done > $@
 
-$(CACHE_DIR)/print_version.sh: config.mak | $(CACHE_DIR)/
+$(print_version): $(config_mak) | $(CACHE_DIR)/
 	@$(info making $@)
 	echo $(SHBANG)
 	fstyle=$(FUNC_STYLE)
@@ -205,7 +198,7 @@ $(CACHE_DIR)/print_version.sh: config.mak | $(CACHE_DIR)/
 		"}"                                                    \
 		"" >> $@
 
-$(CACHE_DIR)/print_help.sh: $(CACHE_DIR)/help_table.txt $(CACHE_DIR)/synopsis.txt 
+$(print_help): $(help_table) $(CACHE_DIR)/synopsis.txt 
 	@$(info making $@)
 	{
 		echo $(SHBANG)
@@ -219,7 +212,7 @@ $(CACHE_DIR)/print_help.sh: $(CACHE_DIR)/help_table.txt $(CACHE_DIR)/synopsis.tx
 			printf '%s\n' 'usage: $(USAGE)' ''
 			echo
 		fi
-		cat $(CACHE_DIR)/help_table.txt
+		cat $(help_table)
 		printf '%s\n' 'EOB' '}'
 	} > $@
 
@@ -283,11 +276,11 @@ $(FUNCS_DIR)/:
 	@$(info creating $(FUNCS_DIR)/ dir)
 	mkdir -p $(FUNCS_DIR)
 
-$(CACHE_DIR)/options_in_use $(CACHE_DIR)/getopt &: $(OPTIONS_FILE) | $(CACHE_DIR)/
+$(CACHE_DIR)/options_in_use $(getopt) &: $(OPTIONS_FILE) | $(CACHE_DIR)/
 	@$(info parsing $(OPTIONS_FILE))
 	mkdir -p $(DOCS_DIR)/options
 	gawk '
-	BEGIN { RS=" |\\n" }
+	BEGIN { RS=" |\\n" ; longest = length("version")}
 
 	/./ {
 		if (match($$0,/^\[?--([^][|[:space:]]+)(([|]-)(\S))?\]?$$/,ma)) 
@@ -447,11 +440,61 @@ $(CACHE_DIR)/options_in_use $(CACHE_DIR)/getopt &: $(OPTIONS_FILE) | $(CACHE_DIR
 	}
 	' $(OPTIONS_FILE)                  \
 			cache=$(CACHE_DIR)             \
-			name=$(NAME) > $(CACHE_DIR)/getopt
+			name=$(NAME) > $(getopt)
+
+$(CACHE_DIR)/copyright.txt: $(config_mak)
+	@$(info making $@)
+	year_created=$(CREATED) year_created=$${year_created%%-*}
+	year_updated=$$(date +'%Y')
+	author="$(AUTHOR)" org=$(ORGANISATION)
+
+	copy_text="Copyright (c) "
+
+	((year_created == year_updated)) \
+		&& copy_text+=$$year_created   \
+		|| copy_text+="$${year_created}-$${year_updated}"
+
+	[[ $$author ]] && copy_text+=", $$author"
+	[[ $$org ]]    && copy_text+=" of $$org  "
+
+	printf '%s\n' \
+		"$$copy_text" "SPDX-License-Identifier: $(LICENSE)" > $@
+
+.PHONY: check
+check: all
+	shellcheck $(MONOLITH)
+
+.PHONY: install uninstall
+
+installed_script    := $(DESTDIR)$(PREFIX)/bin/$(NAME)
+installed_license   := $(DESTDIR)$(PREFIX)/share/licenses/$(NAME)/LICENSE
+installed_manpage   := \
+	$(DESTDIR)$(PREFIX)/share/man/man$(subst .,,$(suffix $(MANPAGE)))/$(MANPAGE)
+
+install: all
+	@[[ -f $${manpage:=$(MANPAGE)} ]] && {
+		echo "install -Dm644 $(MANPAGE) $(installed_manpage)"
+		install -Dm644 $(MANPAGE) $(installed_manpage)
+	}
+	[[ -f LICENSE ]] && {
+		echo "install -Dm644 LICENSE $(installed_license)"
+		install -Dm644 LICENSE $(installed_license)
+	}
+
+	echo "install -Dm755 $(MONOLITH) $(installed_script)"
+	install -Dm755 $(MONOLITH) $(installed_script)
+
+uninstall:
+	@for f in $(installed_script) $(installed_manpage) $(installed_license); do
+		[[ -f $$f ]] || continue
+		echo "rm $$f"
+		rm "$$f"
+	done
+
 
-other_maks := $(filter-out config.mak,$(wildcard *.mak))
+other_maks := $(filter-out $(config_mak),$(wildcard *.mak))
 -include $(other_maks)
 
 # by having all:  last, it is possible to add CUSTOM_TARGETS
-# in "other_maks", and have them automatically apply
+# in 'other_maks', and have them automatically apply
 all: $(CUSTOM_TARGETS) $(MONOLITH) $(BASE)

README.md

@@ -60,8 +60,16 @@ updated: 2020-06-22 by budRich
 
 ## usage
     ssrt [OPTIONS]
-    -h, --help     | print help and exit  
-    -v, --version  | print version info and exit  
+    -e, --codec      CODEC     | CODEC defaults to h264 (or vp8 for webm).  
+    -c, --config-dir DIR       | set ssr conifg directory
+    -n, --container  CONTAINER | set CONTAINER type. example containers: mkv and webm.  
+    -d, --delay      SECONDS   | delay start of recording
+    -h, --help                 | print help and exit  
+    -i, --input-file FILE      | change default (/tmp/ssrt/in) inputfile. 
+    -m, --mute                 | disables audio in recording  
+    -p, --pause                | toggle play/pause or start a new recording.  
+    -s, --select               | select recording area before recording starts.
+    -v, --version              | print version info and exit  
 
 *event scripts* are stored in 
 **SSR\_CONFIG\_DIR**/events\* ,

config.mak

@@ -1,8 +1,8 @@
 NAME         := ssrt
 DESCRIPTION  := simplescreenreocrder - now even simpler
-VERSION      := 2022.05.24.2
+VERSION      := 2022.06.14.1
 CREATED      := 2020-06-19
-UPDATED      := 2022-05-24
+UPDATED      := 2022-06-14
 AUTHOR       := budRich
 ORGANISATION := budlabs
 CONTACT      := https://github.com/budlabs/ssrt
@@ -38,12 +38,11 @@ MANPAGE_DEPS =                 \
  $(DOCS_DIR)/description.md    \
  $(CACHE_DIR)/copyright.txt
 
-# CUSTOM_TARGETS += $(MANPAGE_OUT)
-MANPAGE_OUT = $(MANPAGE)
+MANPAGE := $(NAME).1
 .PHONY: manpage
-manpage: $(MANPAGE_OUT)
+manpage: $(MANPAGE)
 
-$(MANPAGE_OUT): config.mak $(MANPAGE_DEPS) 
+$(MANPAGE): config.mak $(MANPAGE_DEPS) 
 	@$(info making $@)
 	uppercase_name=$(NAME)
 	uppercase_name=$${uppercase_name^^}
@@ -72,29 +71,3 @@ $(MANPAGE_OUT): config.mak $(MANPAGE_DEPS)
 		cat $(DOCS_DIR)/manpage_footer.md
 
 	} | go-md2man > $@
-
-
-# --- INSTALLATION RULES --- #
-installed_manpage    = $(DESTDIR)$(PREFIX)/share/man/man$(manpage_section)/$(MANPAGE)
-installed_script    := $(DESTDIR)$(PREFIX)/bin/$(NAME)
-installed_license   := $(DESTDIR)$(PREFIX)/share/licenses/$(NAME)/$(LICENSE)
-
-install: all
-	@[[ -n $${manpage:=$(MANPAGE_OUT)} && -f $$manpage ]] && {
-		echo "install -Dm644 $(MANPAGE_OUT) $(installed_manpage)"
-		install -Dm644 $(MANPAGE_OUT) $(installed_manpage)
-	}
-	[[ -n $${license:=$(LICENSE)} && -f $$license ]] && {
-		echo "install -Dm644 $(LICENSE) $(installed_license)"
-		install -Dm644 $(LICENSE) $(installed_license)
-	}
-
-	echo "install -Dm755 $(MONOLITH) $(installed_script)"
-	install -Dm755 $(MONOLITH) $(installed_script)
-
-uninstall:
-	@for f in $(installed_script) $(installed_manpage) $(installed_license); do
-		[[ -f $$f ]] || continue
-		echo "rm $$f"
-		rm "$$f"
-	done

options

@@ -1,2 +1,3 @@
+[--pause|-p] [--delay|-d SECONDS] [--select|-s] [--config-dir|-c DIR] [--input-file|-i FILE] [--mute|-m] [--container|-n CONTAINER] [--codec|-e CODEC]  
 --help|-h
 --version|-v