Updated new commit message

Author: yrave

scripts/install.sh

@@ -1,12 +1,11 @@
 #!/bin/sh
 
 # defaults
-PLACEHOLDER_REGEX_COMMIT_ISSUE_NUMBER="^\s*\[[\-\w]*\d\]"
+PLACEHOLDER_REGEX_COMMIT_ISSUE_NUMBER="^\s*[\-\w]*\d:"
 PLACEHOLDER_REGEX_BRANCH_ISSUE_NUMBER="[.]*\/([\-\w]*?\-\d+)"
 PLACEHOLDER_REGEX_GIT_COMMIT_MESSAGES="(Merge\sbranch\s\'|\#\sRebase\s|This\sreverts\scommit\s)"
 PLACEHOLDER_LOGGING_VERBOSE="true"
-
-GITHUB_SCRIPT_URL="https://raw.githubusercontent.com/janniks/prepare-commit-msg/master/scripts/prepare-commit-msg"
+PLACEHOLDER_NEW_COMMIT_MESSAGE="#{issue_number.upcase}: #{original_commit_message.gsub(/(\s[[:punct:]])+$/, '')}"
 
 PATH_GIT_GLOBAL="${HOME}/.git-template/"
 PATH_GIT_LOCAL="./.git/"
@@ -125,7 +124,7 @@ if [ "$OPTION_GLOBAL_TEMPLATE" = true ]; then
 	    printf -- " - A global \'${BLUE}${HOOK_NAME}${RESET}\' git hook already exists. ${RED}Aborting...${RESET}\n\n"
 	    exit
 	fi
-    
+
 	HOOK_FILE="${PATH_GIT_GLOBAL}${HOOK_DIR}${HOOK_NAME}"
 
 	printf -- " - Setting global git-template...\n"
@@ -140,8 +139,10 @@ else
 	HOOK_FILE="${PATH_GIT_LOCAL}${HOOK_DIR}${HOOK_NAME}"
 fi
 
-printf -- " - Downloading git hook...\n"
-curl -s "$GITHUB_SCRIPT_URL" > "$HOOK_FILE"
+printf -- " - Creating git hook file\n"
+
+BASEDIR=$(dirname $0)
+cat "${BASEDIR}/prepare-commit-msg" > "$HOOK_FILE"
 
 printf -- " - Replacing placeholders...\n"
 PLACEHOLDER_REGEX_COMMIT_ISSUE_NUMBER=$(printf -- "$PLACEHOLDER_REGEX_COMMIT_ISSUE_NUMBER" | sed 's/\\/\\\\/g')
@@ -153,11 +154,13 @@ PLACEHOLDER_REGEX_BRANCH_ISSUE_NUMBER=$(printf -- "$PLACEHOLDER_REGEX_BRANCH_ISS
 PLACEHOLDER_REGEX_GIT_COMMIT_MESSAGES=$(printf -- "$PLACEHOLDER_REGEX_GIT_COMMIT_MESSAGES" | sed 's/\\/\\\\/g')
 printf -v PLACEHOLDER_REGEX_GIT_COMMIT_MESSAGES "%q" "$PLACEHOLDER_REGEX_GIT_COMMIT_MESSAGES"
 PLACEHOLDER_REGEX_GIT_COMMIT_MESSAGES=$(printf -- "$PLACEHOLDER_REGEX_GIT_COMMIT_MESSAGES" | sed 's/\//\\\//g')
+PLACEHOLDER_NEW_COMMIT_MESSAGE=$(printf -- "$PLACEHOLDER_NEW_COMMIT_MESSAGE" | sed 's/\//\\\//g')
 
 sed -i '' "s/PLACEHOLDER_REGEX_COMMIT_ISSUE_NUMBER/\/${PLACEHOLDER_REGEX_COMMIT_ISSUE_NUMBER}\//g" "$HOOK_FILE"
 sed -i '' "s/PLACEHOLDER_REGEX_BRANCH_ISSUE_NUMBER/\/${PLACEHOLDER_REGEX_BRANCH_ISSUE_NUMBER}\//g" "$HOOK_FILE"
 sed -i '' "s/PLACEHOLDER_REGEX_GIT_COMMIT_MESSAGES/\/${PLACEHOLDER_REGEX_GIT_COMMIT_MESSAGES}\//g" "$HOOK_FILE"
 sed -i '' "s/PLACEHOLDER_LOGGING_VERBOSE/${PLACEHOLDER_LOGGING_VERBOSE}/g" "$HOOK_FILE"
+sed -i '' "s/PLACEHOLDER_NEW_COMMIT_MESSAGE/${PLACEHOLDER_NEW_COMMIT_MESSAGE}/g" "$HOOK_FILE"
 
 printf -- " - Requesting permission to execute git hook...\n"
 chmod a+x "$HOOK_FILE"

scripts/prepare-commit-msg

@@ -11,7 +11,6 @@ $verbose_prefix = "git hook: "
 regex_commit_issue_number = PLACEHOLDER_REGEX_COMMIT_ISSUE_NUMBER
 regex_branch_issue_number = PLACEHOLDER_REGEX_BRANCH_ISSUE_NUMBER
 regex_git_commit_messages = PLACEHOLDER_REGEX_GIT_COMMIT_MESSAGES
-
 # colorize strings in console output
 class String
 	def error;   "\e[31m#{self}\e[0m" end
@@ -62,7 +61,7 @@ if !issue_number
 end
 
 # combine to new message
-new_commit_message = "[#{issue_number.upcase}] #{original_commit_message.gsub(/(\s[[:punct:]])+$/, '')}"
+new_commit_message = "PLACEHOLDER_NEW_COMMIT_MESSAGE"
 
 # write new commit message to file
 File.open(commit_file, 'w') do |f|