diff --git a/changelog.sh b/changelog.sh index fa37754..83cb9e7 100755 --- a/changelog.sh +++ b/changelog.sh @@ -1,15 +1,24 @@ #!/bin/bash #Manages an /etc/changelog +# Immediately attempt to read from named pipe +# And store the piped content if provided +[[ -p /proc/self/fd/0 ]] && export STDIN=$( cat ) +# And then force the input to be from terminal +exec 0/dev/null && RUN_SUDO=1 [[ $RUN_SUDO -eq 1 ]] && { @@ -22,6 +31,8 @@ CHANGELOG=/etc/changelog msg(){ echo -e "$@"; } panic(){ msg "${@} Exiting."; exit 1;} ENTRY_FILE=$(mktemp) + +# This is the main function change(){ TMP="$1" while true ; do @@ -48,9 +59,6 @@ change(){ read -e -i "n" -p "Another section? [yN]:" END [[ "${END^^}" == "N" ]] && break done - echo -e "\nHere is the content you are about to add.\n\n$(cat $TMP)\n" - read -e -p "OK? [Yn]: " -i y RETURN - [[ "N" == ${RETURN^^} ]] && return 1 } template(){ @@ -112,11 +120,21 @@ echo -e "\nWelcome to Serious Changelogs Inc. Do you have something for me?\n" # check changelog exists [[ ! -f "$CHANGELOG" ]] && template "* Changelog: Added $CHANGELOG file\nIt was not serious. Fixed!\n\n" > "$CHANGELOG" -# parse command -change "$ENTRY_FILE" +# Detect piped content +if [[ -n "$STDIN" ]] ; then + echo -e "$STDIN" > $ENTRY_FILE -[[ $? -eq 0 ]] && exit +#OR enter interactive mode +else + change "$ENTRY_FILE" +fi +# confirm the output +echo -e "\nHere is the content you are about to add:\n\n$(cat $ENTRY_FILE)\n" +read -e -p "OK? [Yn]: " -i y RETURN +[[ "N" == ${RETURN^^} ]] && exit 1 + +# Send data to outputs for (( i=0; i<${#PLUGIN_OUTPUT_MENU[@]}; i++)) ; do echo "${PLUGIN_OUTPUT_MENU[$i]}" ${PLUGIN_OUTPUT[$i]} $ENTRY_FILE diff --git a/config.sample.sh b/config.sample.sh index 3995eeb..c7935c6 100644 --- a/config.sample.sh +++ b/config.sample.sh @@ -1,3 +1,4 @@ +CHANGELOG=/etc/Changelog CHANGELOG_SERVER=https://changelog.example.com CHANGELOG_AUTH_KEY=your-shared-secret HASTEBIN_SERVER=https://hastebin.com diff --git a/plugins-available/content-command.sh b/plugins-available/content-command.sh new file mode 100644 index 0000000..e7a9a27 --- /dev/null +++ b/plugins-available/content-command.sh @@ -0,0 +1,11 @@ +#!/bin/bash +# Add a content line by decorating the input with triple backticks ``` +PLUGIN_CONTENT+=( hookContentCmd ) +hookContentCmd(){ + [[ -z "$1" ]] && echo "Add a shell command line" && return + TMP="$1" + read -e -p "Command line? " CMD + [[ -z "$CMD" ]] && panic "Not a valid content" && return + echo "\`\`\`$CMD\`\`\`" >> $TMP +} + diff --git a/plugins-available/content-hastebin.sh b/plugins-available/content-hastebin.sh index 2b7a238..aa1d03b 100644 --- a/plugins-available/content-hastebin.sh +++ b/plugins-available/content-hastebin.sh @@ -1,15 +1,15 @@ #!/bin/bash -# Sends the changelog information to a changelog server -# see https://git.interhacker.space/alban/changelog-server +# Adds a line by sending a file to a hastebin server +# and then print a "/a/file/name https://haste.bin/urlurlurl" line # Requires an environmental variable to work -# ex: HASTEBIN_SERVER=https://paste.interhacker.space +# example HASTEBIN_SERVER=https://paste.interhacker.space PLUGIN_CONTENT+=( hookContentHastebin ) hookContentHastebin(){ [[ -z "$1" ]] && echo "Store a file by name in pastebin" && return [[ -z "$HASTEBIN_SERVER" ]] && echo "Missing HASTEBIN_SERVER variable. Exiting." && return TMP="$1" read -e -p "File location? " FILE - [[ ! -f $FILE ]] && panic "Not a valid file" && exit + [[ ! -f $FILE ]] && panic "Not a valid file" && return URL=$( curl -X POST -s -d "$(cat "$FILE" )" "$HASTEBIN_SERVER/documents" | awk -F '"' '{print "'$HASTEBIN_SERVER'/raw/"$4}'; ) echo "$FILE: $URL" >> $TMP }