References and command update in setup module

Author: piedpipr

modules/gitssh-setup.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #================================================================#
-# GIT-SSH SETUP MODULE
+# GitSSH SETUP MODULE
 # Interactive SSH key setup for GitHub and GitLab
 #================================================================#
 
@@ -67,15 +67,15 @@ setup_github() {
         return 1
     fi
 
-    # Step 8: Integration with Git-SSH Session Manager
+    # Step 8: Integration with GitSSH Session Manager
     _integrate_with_session_manager "github"
 
     _print_success "GitHub SSH setup completed successfully!"
     printf "\n"
-    _print_info "You can now use the Git-SSH Session Manager:"
-    printf "  • Run 'session_set' to configure your identity for repositories\n"
-    printf "  • Use 'git_clone', 'git_push', etc. for enhanced Git operations\n"
-    printf "  • Run 'ssh_remote' to convert HTTPS repositories to SSH\n"
+    _print_info "You can now use the GitSSH Session Manager:"
+    printf "  • Run 'gitssh session set' to configure your identity for repositories\n"
+    printf "  • Use 'gitssh clone', 'gitssh push', etc. for enhanced Git operations\n"
+    printf "  • Run 'gitssh remote convert' to convert HTTPS repositories to SSH\n"
     printf "\n"
 }
 
@@ -133,15 +133,15 @@ setup_gitlab() {
         return 1
     fi
 
-    # Step 8: Integration with Git-SSH Session Manager
+    # Step 8: Integration with GitSSH Session Manager
     _integrate_with_session_manager "gitlab"
 
     _print_success "GitLab SSH setup completed successfully!"
     printf "\n"
-    _print_info "You can now use the Git-SSH Session Manager:"
-    printf "  • Run 'session_set' to configure your identity for repositories\n"
-    printf "  • Use 'git_clone', 'git_push', etc. for enhanced Git operations\n"
-    printf "  • Run 'ssh_remote' to convert HTTPS repositories to SSH\n"
+    _print_info "You can now use the GitSSH Session Manager:"
+    printf "  • Run 'gitssh session set' to configure your identity for repositories\n"
+    printf "  • Use 'gitssh clone', 'gitssh push', etc. for enhanced Git operations\n"
+    printf "  • Run 'gitssh remote convert' to convert HTTPS repositories to SSH\n"
     printf "\n"
 }
 
@@ -187,7 +187,7 @@ ssh_status() {
 
     if [ "$key_count" -eq 0 ]; then
         _print_warning "No SSH keys found"
-        printf "  Run 'setup_github' or 'setup_gitlab' to create keys\n"
+        printf "  Run 'gitssh setup github' or 'gitssh setup gitlab' to create keys\n"
     fi
     printf "\n"
 
@@ -576,7 +576,7 @@ _generate_ssh_key() {
         printf "\nKey details:\n"
         printf "  Private key: %s (keep this secret!)\n" "$KEY_PATH"
         printf "  Public key: %s (this will be added to $service)\n" "$KEY_PATH.pub"
-        printf "  Fingerprint: "
+        printf "  Fingerprint: "gitssh ssh 
         ssh-keygen -lf "$KEY_PATH.pub" 2>/dev/null | awk '{print $2}'
     else
         _print_error "Failed to generate SSH key"
@@ -893,21 +893,21 @@ _test_gitlab_connection() {
 # INTEGRATION FUNCTIONS
 #================================================================#
 
-# Integrate with Git-SSH Session Manager
+# Integrate with GitSSH Session Manager
 _integrate_with_session_manager() {
     service="$1"
 
-    printf "Step 8: Integration with Git-SSH Session Manager\n"
+    printf "Step 8: Integration with GitSSH Session Manager\n"
     printf "================================================\n"
 
-    _print_info "About Git-SSH Session Manager:"
+    _print_info "About GitSSH Session Manager:"
     printf "This tool helps you manage multiple Git identities and SSH keys.\n"
     printf "It automatically configures the right user for each repository.\n\n"
 
-    # Check if Git-SSH Session Manager is available
+    # Check if GitSSH Session Manager is available
     if ! _check_dependencies 2>/dev/null; then
-        _print_warning "Git-SSH Session Manager not fully configured"
-        printf "Run 'git_ssh_init' to complete the setup\n\n"
+        _print_warning "GitSSH Session Manager not fully configured"
+        printf "Run 'gitssh init' to complete the setup\n\n"
         return 0
     fi
 
@@ -922,14 +922,14 @@ _integrate_with_session_manager() {
     esac
 
     if ! _user_exists "$username" 2>/dev/null; then
-        printf "Adding user to Git-SSH Session Manager...\n"
+        printf "Adding user to GitSSH Session Manager...\n"
 
         # Add user to config
         if _add_user_to_config "$username" "$USER_NAME" "$USER_EMAIL" "$SSH_HOST"; then
             _print_success "Added '$username' to session manager"
         else
             _print_warning "Failed to add user to session manager"
-            printf "You can add manually later with 'git_add_user'\n"
+            printf "You can add manually later with 'gitssh user add'\n"
         fi
     else
         _print_success "User '$username' already exists in session manager"
@@ -1104,7 +1104,7 @@ setup_github_multi() {
 
     printf "\n"
     _print_success "Multiple GitHub accounts setup completed!"
-    _print_info "Use 'ssh_status' to see all configured connections"
+    _print_info "Use 'gitssh ssh status' to see all configured connections"
 }
 
 # Quick SSH key generation (minimal prompts)
@@ -1266,7 +1266,7 @@ ssh_doctor() {
 
     if [ "$key_count" -eq 0 ]; then
         _print_warning "No SSH keys found"
-        printf "  Generate with: setup_github or setup_gitlab\n"
+        printf "  Generate with: gitssh setup github or gitssh setup gitlab\n"
         issues_found=$((issues_found + 1))
     fi
     printf "\n"
@@ -1307,7 +1307,7 @@ ssh_doctor() {
 
         if [ "$github_entries" -eq 0 ] && [ "$gitlab_entries" -eq 0 ]; then
             _print_warning "No GitHub or GitLab SSH hosts configured"
-            printf "  Setup with: setup_github or setup_gitlab\n"
+            printf "  Setup with: gitssh setup github or gitssh setup gitlab\n"
             issues_found=$((issues_found + 1))
         fi
     else
@@ -1363,7 +1363,7 @@ ssh_doctor() {
     else
         _print_warning "Found $issues_found issue(s) that need attention"
         printf "\nSuggested fixes:\n"
-        printf "  • For missing keys: run 'setup_github' or 'setup_gitlab'\n"
+        printf "  • For missing keys: run 'gitssh setup github' or 'gitssh setup gitlab'\n"
         printf "  • For permission issues: chmod 700 ~/.ssh && chmod 600 ~/.ssh/id_*\n"
         printf "  • For agent issues: eval \$(ssh-agent -s) && ssh-add ~/.ssh/your_key\n"
         printf "  • For connection failures: check if keys are added to your account\n"
@@ -1473,7 +1473,7 @@ ssh_repair() {
 
     if [ "$repairs_made" -gt 0 ]; then
         _print_success "Completed $repairs_made repairs"
-        printf "Run 'ssh_status' to verify the fixes\n"
+        printf "Run 'gitssh ssh status' to verify the fixes\n"
     else
         _print_info "No repairs needed - SSH setup appears correct"
     fi
@@ -1594,7 +1594,7 @@ _add_user_to_config() {
     # Check if session manager is available
     if command -v git_add_user >/dev/null 2>&1 && _check_dependencies 2>/dev/null; then
         # Use existing session manager function
-        printf "Integrating with Git-SSH Session Manager...\n"
+        printf "Integrating with GitSSH Session Manager...\n"
 
         # Create temporary script to automate git_add_user
         temp_script=$(_create_temp_file)
@@ -1614,8 +1614,8 @@ EOF
         fi
     else
         # Session manager not available - just inform user
-        printf "Git-SSH Session Manager not available\n"
-        printf "Run 'git_ssh_init' first to enable full integration\n"
+        printf "GitSSH Session Manager not available\n"
+        printf "Run 'gitssh init' first to enable full integration\n"
         return 1
     fi
 }
@@ -1686,18 +1686,18 @@ ssh_learn() {
 
     printf "Getting Started:\n"
     printf "================\n"
-    printf "1. Run 'setup_github' or 'setup_gitlab' for guided setup\n"
-    printf "2. Use 'ssh_status' to check your configuration\n"
-    printf "3. Use 'ssh_doctor' if you have connection issues\n"
-    printf "4. Use 'session_set' to manage identities per repository\n\n"
+    printf "1. Run 'gitssh setup github' or 'gitssh setup gitlab' for guided setup\n"
+    printf "2. Use 'gitssh ssh status' to check your configuration\n"
+    printf "3. Use 'gitssh ssh doctor' if you have connection issues\n"
+    printf "4. Use 'gitssh session set' to manage identities per repository\n\n"
 
     printf "Common Commands:\n"
     printf "================\n"
-    printf "• ssh_status        - Check SSH setup status\n"
-    printf "• ssh_doctor        - Diagnose SSH issues\n"
-    printf "• ssh_repair        - Fix common problems\n"
-    printf "• setup_github      - Setup GitHub SSH\n"
-    printf "• setup_gitlab      - Setup GitLab SSH\n"
+    printf "• gitsh ssh status        - Check SSH setup status\n"
+    printf "• gitsh ssh doctor        - Diagnose SSH issues\n"
+    printf "• gitsh ssh repair        - Fix common problems\n"
+    printf "• gitsh setup github      - Setup GitHub SSH\n"
+    printf "• gitsh setup gitlab      - Setup GitLab SSH\n"
     printf "• quick_ssh_key     - Generate key quickly\n"
     printf "• remove_ssh_setup  - Clean removal\n\n"
 }
@@ -1723,7 +1723,9 @@ ssh_troubleshoot() {
     printf "   Solutions:\n"
     printf "   • Verify key is added: ssh_status\n"
     printf "   • Check SSH agent: ssh-add -l\n"
-    printf "   • Test connection: ssh -T git@github.com\n\n"
+    printf "   • Test connection: ssh -T git@github.com\n"
+    printf "   • Try adding the key to SSH agent again: ssh-add %s\n" "$KEY_PATH"
+    printf "\n"
 
     printf "2. 'Could not open a connection to your authentication agent'\n"
     printf "   Solution:\n"
@@ -2045,53 +2047,53 @@ ssh_setup_help() {
     printf "\n"
     _print_color blue "=========================================="
     printf "\n"
-    _print_color blue "    Git-SSH Setup Module Help"
+    _print_color blue "    GitSSH Setup Module Help"
     printf "\n"
     _print_color blue "=========================================="
     printf "\n\n"
 
     printf "SETUP COMMANDS:\n"
     printf "===============\n"
-    printf "setup_github        - Interactive GitHub SSH setup wizard\n"
-    printf "setup_gitlab        - Interactive GitLab SSH setup wizard\n"
+    printf "gitssh setup github - Interactive GitHub SSH setup wizard\n"
+    printf "gitssh setupgitlab  - Interactive GitLab SSH setup wizard\n"
     printf "setup_github_multi  - Setup multiple GitHub accounts\n"
     printf "quick_ssh_key       - Quick key generation\n\n"
 
     printf "STATUS & DIAGNOSTICS:\n"
     printf "=====================\n"
-    printf "ssh_status          - Show complete SSH setup status\n"
-    printf "ssh_doctor          - Diagnose SSH connection issues\n"
-    printf "ssh_repair          - Automatically fix common problems\n\n"
+    printf "gitssh ssh status   - Show complete SSH setup status\n"
+    printf "gitssh ssh doctor   - Diagnose SSH connection issues\n"
+    printf "gitssh ssh repair   - Fix common problems\n\n"
 
     printf "MANAGEMENT:\n"
     printf "===========\n"
-    printf "ssh_backup          - Create backup of SSH configuration\n"
-    printf "ssh_restore <dir>   - Restore from backup\n"
-    printf "remove_ssh_setup    - Remove SSH setup for service\n\n"
+    printf "gitssh ssh backup           - Create backup of SSH configuration\n"
+    printf "gitssh ssh restore <dir>    - Restore from backup\n"
+    printf "remove_ssh_setup            - Remove SSH setup for service\n\n"
 
     printf "LEARNING:\n"
     printf "=========\n"
-    printf "ssh_learn           - Learn about SSH and Git\n"
+    printf "gitssh ssh learn           - Learn about SSH and Git\n"
     printf "ssh_troubleshoot    - Troubleshooting guide\n"
     printf "ssh_setup_help      - This help message\n\n"
 
     printf "GETTING STARTED:\n"
     printf "================\n"
-    printf "1. Run 'setup_github' for GitHub setup\n"
-    printf "2. Or 'setup_gitlab' for GitLab setup\n"
-    printf "3. Use 'ssh_status' to verify setup\n"
-    printf "4. Run 'session_set' to configure repository identity\n\n"
+    printf "1. Run 'gitssh setup github' for GitHub setup\n"
+    printf "2. Or 'gitssh setup gitlab' for GitLab setup\n"
+    printf "3. Use 'gitssh ssh status' to verify setup\n"
+    printf "4. Run 'gitssh session set' to configure repository identity\n\n"
 
     printf "INTEGRATION:\n"
     printf "============\n"
-    printf "This module integrates with the Git-SSH Session Manager.\n"
+    printf "This module integrates with the GitSSH Session Manager.\n"
     printf "After SSH setup, use these commands:\n"
-    printf "• session_set      - Configure user identity per repository\n"
-    printf "• git_commit    - Enhanced commit with user verification\n"
-    printf "• git_push      - Enhanced push with connection testing\n"
-    printf "• ssh_remote    - Convert HTTPS repositories to SSH\n\n"
+    printf "• gitssh session set      - Configure user identity per repository\n"
+    printf "• gitssh commit           - Enhanced commit with user verification\n"
+    printf "• gitssh push             - Enhanced push with connection testing\n"
+    printf "• gitssh remote convert   - Convert HTTPS repositories to SSH\n\n"
 
-    printf "For more help: ssh_learn\n"
+    printf "For more help: gitssh ssh learn\n"
     printf "\n"
 }
 
@@ -2104,31 +2106,31 @@ ssh_commands() {
 
     # Core setup
     printf "\nSETUP:\n"
-    printf "  setup_github       - GitHub SSH setup wizard\n"
-    printf "  setup_gitlab       - GitLab SSH setup wizard\n"
+    printf "  gitssh setup_github       - GitHub SSH setup wizard\n"
+    printf "  gitssh setup_gitlab       - GitLab SSH setup wizard\n"
     printf "  setup_github_multi - Multiple GitHub accounts\n"
     printf "  quick_ssh_key      - Quick key generation\n"
 
     # Status and diagnostics
     printf "\nSTATUS:\n"
-    printf "  ssh_status         - Complete SSH status\n"
-    printf "  ssh_doctor         - Diagnose issues\n"
-    printf "  ssh_repair         - Fix common problems\n"
+    printf "  gitssh ssh status         - Complete SSH status\n"
+    printf "  gitssh ssh doctor         - Diagnose issues\n"
+    printf "  gitssh ssh repair         - Fix common problems\n"
 
     # Management
     printf "\nMANAGEMENT:\n"
-    printf "  ssh_backup         - Backup configuration\n"
-    printf "  ssh_restore        - Restore from backup\n"
-    printf "  remove_ssh_setup   - Remove service setup\n"
+    printf "  gitssh ssh backup         - Backup configuration\n"
+    printf "  gitssh ssh restore        - Restore from backup\n"
+    printf "  remove_ssh_setup          - Remove service setup\n"
 
     # Help and learning
     printf "\nHELP:\n"
-    printf "  ssh_learn          - Learning guide\n"
+    printf "  gitssh ssh learn          - Learning guide\n"
     printf "  ssh_troubleshoot   - Troubleshooting\n"
     printf "  ssh_setup_help     - Detailed help\n"
     printf "  ssh_commands       - This command list\n"
 
     printf "\n"
-    _print_info "Start with: setup_github or setup_gitlab"
+    _print_info "Start with: gitssh setup github or gitssh setup gitlab"
     printf "\n"
 }