diff --git a/scripts/Debian/Software/Python/pyenv.sh b/scripts/Common/Software/pyenv/install.sh similarity index 100% rename from scripts/Debian/Software/Python/pyenv.sh rename to scripts/Common/Software/pyenv/install.sh diff --git a/scripts/Debian/Software/Python/install.sh b/scripts/Debian/Software/Python/install.sh index b73eed33..c1219443 100755 --- a/scripts/Debian/Software/Python/install.sh +++ b/scripts/Debian/Software/Python/install.sh @@ -1,5 +1,3 @@ #!/bin/bash -pushd "${BASH_SOURCE%/*}" > /dev/null; -source "./setup.sh"; -source "./pyenv.sh"; -popd > /dev/null; +sudo apt install -y python3 python-is-python3 python3-pip; +sudo pip install pipenv; diff --git a/scripts/Debian/Software/Python/setup.sh b/scripts/Debian/Software/Python/setup.sh deleted file mode 100755 index f464da87..00000000 --- a/scripts/Debian/Software/Python/setup.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash -# Elevate script -if [ ! "$UID" -eq 0 ] -then - sudo bash "$BASH_SOURCE"; -else - apt install -y python3 python-is-python3 python3-pip; - pip install pipenv; -fi diff --git a/scripts/PopOS/Collections/personal.sh b/scripts/PopOS/Collections/personal.sh index 251a98eb..daaa5f0d 100755 --- a/scripts/PopOS/Collections/personal.sh +++ b/scripts/PopOS/Collections/personal.sh @@ -22,6 +22,7 @@ source "../../Debian/Software/VSCodium/install.sh"; source "../../Debian/Software/Visual Studio Code/install.sh"; source "../../Common/Software/Node.js/install.sh"; source "../../Debian/Software/Python/install.sh"; +source "../../Common/Software/pyenv/install.sh"; source "../../Common/Software/tea/install.sh"; source "../../Common/Software/Godot/install.sh"; source "../../Debian/Software/Virtual Machine Manager/install.sh";