From f4e23651963260db993c3d54ec62df468c8357fe Mon Sep 17 00:00:00 2001 From: Eshan Roy Date: Wed, 4 Dec 2024 20:30:09 +0530 Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=80=20feat(=5Fbump):=20upgrade=20=3D>?= =?UTF-8?q?=202.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config.sh | 81 +++++++++++++++++++++++++++++++++++++++++++++++++++ git-config.sh | 55 ---------------------------------- push.sh | 64 ++++++++++++++++++++++++++++++++-------- 3 files changed, 133 insertions(+), 67 deletions(-) create mode 100755 config.sh delete mode 100755 git-config.sh diff --git a/config.sh b/config.sh new file mode 100755 index 0000000..61f9e33 --- /dev/null +++ b/config.sh @@ -0,0 +1,81 @@ +#!/bin/bash + +# Author: Eshan Roy +# Author URI: https://eshanized.github.io + +set -e + +# Function to display usage instructions +usage() { + cat <] [--username ] [-h] + +Options: + --email Set the GitHub user email. + --username Set the GitHub username. + -h, --help Display this help message. + +Description: + This script configures your GitHub user.email and user.name settings globally. + If no arguments are provided, it will prompt for input interactively. + +Examples: + ${0##*/} --email user@example.com --username "Eshan Roy" +EOF + exit 1 +} + +# Parse command-line arguments +while [[ "$#" -gt 0 ]]; do + case "$1" in + --email) + EMAIL="$2" + shift 2 + ;; + --username) + USERNAME="$2" + shift 2 + ;; + -h|--help) + usage + ;; + *) + echo "Unknown argument: $1" + usage + ;; + esac +done + +# Prompt for email if not provided +if [[ -z "${EMAIL:-}" ]]; then + read -p "Enter your GitHub Email: " EMAIL +fi + +# Prompt for username if not provided +if [[ -z "${USERNAME:-}" ]]; then + read -p "Enter your GitHub Username: " USERNAME +fi + +# Validate email format +if ! [[ "$EMAIL" =~ ^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$ ]]; then + echo "Error: Invalid email format: $EMAIL" + exit 1 +fi + +# Validate username (allowing alphanumerics, dashes, underscores, and dots) +if ! [[ "$USERNAME" =~ ^[a-zA-Z0-9._-]+$ ]]; then + echo "Error: Invalid username format: $USERNAME" + exit 1 +fi + +# Configure GitHub global settings +git config --global user.email "$EMAIL" +git config --global user.name "$USERNAME" + +# Display success message +echo -e "\033[1;32mGitHub configuration setup successful!\033[0m" +echo " User Email: $EMAIL" +echo " Username: $USERNAME" +echo -e "\033[1;36mYou can verify this configuration using the following commands:\033[0m" +echo " git config --global user.email" +echo " git config --global user.name" \ No newline at end of file diff --git a/git-config.sh b/git-config.sh deleted file mode 100755 index ece8d8a..0000000 --- a/git-config.sh +++ /dev/null @@ -1,55 +0,0 @@ -#!/usr/bin/env bash - -# Author: Eshan Roy -# Description: This script configures GitHub user email and username. - -set -e - -# Function to display usage -usage() { - echo "Usage: ${0##*/} [--email ] [--username ] [-h]" - echo " --email Set the GitHub user email." - echo " --username Set the GitHub username." - echo " -h Display this help message." - exit 1 -} - -# Parse command line arguments -while [[ "$#" -gt 0 ]]; do - case "$1" in - --email) - EMAIL="$2" - shift 2 - ;; - --username) - USERNAME="$2" - shift 2 - ;; - -h|--help) - usage - ;; - *) - echo "Unknown parameter passed: $1" - usage - ;; - esac -done - -# Prompt for email if not provided -if [ -z "$EMAIL" ]; then - read -p "Enter your GitHub email: " EMAIL -fi - -# Prompt for username if not provided -if [ -z "$USERNAME" ]; then - read -p "Enter your GitHub username: " USERNAME -fi - -# Set the Git configuration -git config --global user.email "$EMAIL" -git config --global user.name "$USERNAME" - -# Confirmation message -echo "GitHub configuration updated:" -echo " User Email: $EMAIL" -echo " Username: $USERNAME" \ No newline at end of file diff --git a/push.sh b/push.sh index bc6d7e7..fd64d1d 100755 --- a/push.sh +++ b/push.sh @@ -3,15 +3,35 @@ # Author : ESHAN ROY # Author URI : https://eshanized.github.io -# NOTE : RUN AT YOUR OWN RISK! +# NOTE : Run at your own risk! -# Define the conventional commit types with emojis -TYPES=("๐ŸŽ‰ feat" "๐Ÿž fix" "๐Ÿ“š docs" "๐Ÿ’… style" "๐Ÿ”จ refactor" "โšก๏ธ perf" "๐Ÿงช test" "๐Ÿ› ๏ธ build" "๐Ÿค– ci" "๐Ÿงน chore" "โช๏ธ revert") +# Define the conventional commit types with new emojis +TYPES=("๐Ÿš€ feat" "๐Ÿ› fix" "๐Ÿ“ docs" "โœจ style" "๐Ÿ›  refactor" "โšก๏ธ perf" "๐Ÿ”ฌ test" "๐Ÿ”ง build" "๐Ÿค– ci" "๐Ÿงน chore" "โช revert") + +# Function to display an error and exit +error_exit() { + echo -e "\033[1;31m[ERROR]\033[0m $1" + exit 1 +} + +# Ensure the script is run in a Git repository +git rev-parse --is-inside-work-tree > /dev/null 2>&1 || error_exit "This is not a Git repository." + +# Get the current branch name +branch=$(git rev-parse --abbrev-ref HEAD) + +# Pull the latest changes from the remote repository +echo "Pulling latest changes from remote branch '$branch'..." +git pull origin "$branch" || error_exit "Failed to pull changes from the remote repository. Please resolve any conflicts manually." # Prompt the user to select a commit type echo "Select a commit type:" select type in "${TYPES[@]}"; do - break + if [[ -n "$type" ]]; then + break + else + echo "Invalid selection. Please try again." + fi done # Extract the commit type and emoji from the selection @@ -21,35 +41,55 @@ emoji=${type_emoji% *} # Prompt the user to enter a scope (optional) read -p "Enter a scope (optional): " scope +scope_part="" +if [ -n "$scope" ]; then + scope_part="($scope)" +fi # Prompt the user to enter a short description read -p "Enter a short description: " desc +if [ -z "$desc" ]; then + error_exit "A short description is required!" +fi # Prompt the user to enter a longer description (optional) read -p "Enter a longer description (optional): " long_desc # Create the commit message -commit_msg="$emoji $type($scope): $desc" +commit_msg="$emoji $type$scope_part: $desc" # If a longer description was provided, add it to the commit message if [ -n "$long_desc" ]; then - commit_msg+=" + commit_msg+=" $long_desc" fi # Print the commit message to the console -echo "Commit message:" -echo "$commit_msg" +echo -e "\nCommit message:" +echo -e "\033[1;36m$commit_msg\033[0m" -# Pull form Github -git pull +# Confirm before committing +read -p "Do you want to proceed with this commit? (y/n): " confirm +if [[ "$confirm" != "y" && "$confirm" != "Y" ]]; then + echo "Commit aborted." + exit 0 +fi # Stage all changes git add . # Commit the changes with the conventional commit message -git commit -m "$commit_msg" +if git commit -m "$commit_msg"; then + echo -e "\033[1;32mCommit successful!\033[0m" +else + error_exit "Commit failed." +fi # Push the changes to the remote repository -git push origin $(git rev-parse --abbrev-ref HEAD) \ No newline at end of file +echo "Pushing changes to remote branch '$branch'..." +if git push origin "$branch"; then + echo -e "\033[1;32mChanges pushed to remote branch '$branch'.\033[0m" +else + error_exit "Push failed. Please check your connection or branch permissions." +fi \ No newline at end of file