diff --git a/customscripts/install_script.sh b/customscripts/install_script.sh index 67ea5bd..3467d49 100644 --- a/customscripts/install_script.sh +++ b/customscripts/install_script.sh @@ -8,11 +8,10 @@ tmpDir='/tmp/customscripts' finalDir='/usr/share/customscripts' # echo "Updating software lists" -# sudo apt update +sudo apt update # echo "Installan my packages" -# sudo apt install gh net-tools htop btop iptraf iotop screen byobu wget python3 python3-pip python3-virtualenv python3-setuptools thefuck nginx wget lynx neovim nmap -y - +sudo apt install gh unattended-upgrades net-tools htop btop iptraf iotop screen byobu wget python3 python3-pip python3-virtualenv python3-setuptools thefuck nginx apache2 wget lynx neovim nmap docker.io zip unzip 7zip net-tools chkrootkit clamav php restic cifs-utils psmisc detox fdupes -y echo "Using Shell $SHELL" # ta get da right usermayhaps diff --git a/customscripts/python_pyenv_setup.sh b/customscripts/python_pyenv_setup.sh index 6a91928..c115d9f 100644 --- a/customscripts/python_pyenv_setup.sh +++ b/customscripts/python_pyenv_setup.sh @@ -36,14 +36,9 @@ check_purge_package () { # cleanup -echo "Autoremoving packages" -sudo apt autoremove -y 2>>"$package_log" 1>>"$package_log" - -echo -e "DONE CLEARING OLD PACKAGES!\n\tRemoved packages logged to $package_log" - -# remove any existing pyenv install -which pyenv # do it silently -pyenv_root_check=$? +# echo "Autoremoving packages" +# sudo apt autoremove -y 2>>"$package_log" 1>>"$package_log" +# echo -e "DONE CLEARING OLD PACKAGES!\n\tRemoved packages logged to $package_log" if [ -d $HOME/.pyenv ]; then echo "Removing existing pyenv installation" @@ -77,7 +72,7 @@ if [ $rc_pyalias_check -eq 0 ]; then # if aliases found echo "pyenv aliases already set up in $rcfile, skipping" else # if aliases not found, add python shit echo "Setting up pyenv aliases in $rcfile" - echo -e "\n## python aliases" >> $rcfile + echo "## python aliases" >> $rcfile echo 'alias py=python' >> $rcfile echo 'alias py3=python' >> $rcfile echo 'alias py2=python' >> $rcfile diff --git a/customscripts/setup_git.sh b/customscripts/setup_git.sh index 36095ec..9ed2692 100644 --- a/customscripts/setup_git.sh +++ b/customscripts/setup_git.sh @@ -1,20 +1,19 @@ #!/bin/bash +# usage +## curl -s https://raw.githubusercontent.com/PrincessPi3/general-scripts-and-system-ssssssetup/refs/heads/main/customscripts/setup_git.sh | "$SHELL" echo "Setting up Github" -echo "Enter Github Classic Token (https://github.com/settings/tokens)" -read GITHUB_TOKEN +read -p "Enter Github Classic Token (https://github.com/settings/tokens): " gh_token -echo "Enter Email Address" -read EMAIL_ADDRESS +read -p "Enter Email Address: " gh_email -echo "Enter Github Username" -read GITHUB_USERNAME +read -p "Enter Github Username: " gh_username sudo apt update sudo apt install git gh -y echo "Saving Token to ~/.gh_token" -echo $GITHUB_TOKEN > ~/.gh_token +echo $gh_token > ~/.gh_token chmod 600 ~/.gh_token echo "Logging into Github" @@ -22,7 +21,7 @@ gh auth login --with-token < ~/.gh_token gh auth setup-git echo "Configuring Git" -git config --global user.email "$EMAIL_ADDRESS" -git config --global user.name "$GITHUB_USERNAME" +git config --global user.email "$gh_email" +git config --global user.name "$gh_username" echo "DONE WOOO :3~" \ No newline at end of file