dont sudo activate

s-martin · Oct 22, 2023 · 84128dd · 84128dd
1 parent 6fa77cc
commit 84128dd
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/components/rfid-reader/PN532/setup_pn532.sh b/components/rfid-reader/PN532/setup_pn532.sh
@@ -35,7 +35,7 @@ fi
 printf "Installing Python requirements for PN532...\n"
 # Use a venv as Bookworm implemented PEP668 https://stackoverflow.com/a/75696359
 sudo python3 -m venv .venv
-sudo source .venv/bin/activate
+source .venv/bin/activate
 sudo python3 -m pip install --upgrade --force-reinstall -q -r "${JUKEBOX_HOME_DIR}"/components/rfid-reader/PN532/requirements.txt
 
 printf "Configure RFID reader in Phoniebox...\n"

diff --git a/components/rfid-reader/RC522/setup_rc522.sh b/components/rfid-reader/RC522/setup_rc522.sh
@@ -19,7 +19,7 @@ question "Continue"
 printf "Installing Python requirements for RC522...\n"
 # Use a venv as Bookworm implemented PEP668 https://stackoverflow.com/a/75696359
 sudo python3 -m venv .venv
-sudo source .venv/bin/activate
+source .venv/bin/activate
 sudo python3 -m pip install --upgrade --force-reinstall -q -r "${JUKEBOX_HOME_DIR}"/components/rfid-reader/RC522/requirements.txt
 
 printf "Activating SPI...\n"

diff --git a/scripts/RegisterDevice.py.Multi b/scripts/RegisterDevice.py.Multi
@@ -34,7 +34,7 @@ def setupPN532():
     print("Installing Python requirements for PN532...\n")
     # Use a venv as Bookworm implemented PEP668 https://stackoverflow.com/a/75696359
     runCmd("sudo python3 -m venv .venv")
-    runCmd("sudo source .venv/bin/activate")
+    runCmd("source .venv/bin/activate")
     runCmd("sudo python3 -m pip install --upgrade --force-reinstall "
            "-q -r {}/components/rfid-reader/PN532/requirements.txt".format(JUKEBOX_HOME_DIR))
     print("Done")
@@ -49,7 +49,7 @@ def setupMFRC522():
     print("Installing Python requirements for RC522...\n")
     # Use a venv as Bookworm implemented PEP668 https://stackoverflow.com/a/75696359
     runCmd("sudo python3 -m venv .venv")
-    runCmd("sudo source .venv/bin/activate")
+    runCmd("source .venv/bin/activate")
     runCmd("sudo python3 -m pip install --upgrade --force-reinstall "
            "-q -r {}/components/rfid-reader/RC522/requirements.txt".format(JUKEBOX_HOME_DIR))
     print("Done")

diff --git a/scripts/installscripts/buster-install-default-with-autohotspot.sh b/scripts/installscripts/buster-install-default-with-autohotspot.sh
@@ -873,15 +873,15 @@ install_main() {
         # Install necessary Python packages
         # Use a venv as Bookworm implemented PEP668 https://stackoverflow.com/a/75696359
         sudo python3 -m venv .venv
-        sudo source .venv/bin/activate
+        source .venv/bin/activate
         sudo python3 -m pip install --upgrade --force-reinstall -q -r "${jukebox_dir}"/requirements-spotify.txt
     fi
 
     # Install more required packages
     echo "Installing additional Python packages..."
     # Use a venv as Bookworm implemented PEP668 https://stackoverflow.com/a/75696359
     sudo python3 -m venv .venv
-    sudo source .venv/bin/activate
+    source .venv/bin/activate
     sudo python3 -m pip install --upgrade --force-reinstall -q -r "${jukebox_dir}"/requirements.txt
 
     samba_config
@@ -1018,7 +1018,7 @@ install_main() {
     if [[ "${GPIOconfig}" == "YES" ]]; then
         # Use a venv as Bookworm implemented PEP668 https://stackoverflow.com/a/75696359
         sudo python3 -m venv .venv
-        sudo source .venv/bin/activate
+        source .venv/bin/activate
         sudo python3 -m pip install --upgrade --force-reinstall -q -r "${jukebox_dir}"/requirements-GPIO.txt
         sudo systemctl enable phoniebox-gpio-control.service
         if [[ ! -f "${jukebox_dir}"/settings/gpio_settings.ini ]]; then

diff --git a/scripts/installscripts/buster-install-default.sh b/scripts/installscripts/buster-install-default.sh
@@ -874,15 +874,15 @@ install_main() {
         # Install necessary Python packages
         # Use a venv as Bookworm implemented PEP668 https://stackoverflow.com/a/75696359
         sudo python3 -m venv .venv
-        sudo source .venv/bin/activate
+        source .venv/bin/activate
         sudo python3 -m pip install --upgrade --force-reinstall -q -r "${jukebox_dir}"/requirements-spotify.txt
     fi
 
     # Install more required packages
     echo "Installing additional Python packages..."
     # Use a venv as Bookworm implemented PEP668 https://stackoverflow.com/a/75696359
     sudo python3 -m venv .venv
-    sudo source .venv/bin/activate
+    source .venv/bin/activate
     sudo python3 -m pip install --upgrade --force-reinstall -q -r "${jukebox_dir}"/requirements.txt
 
     samba_config
@@ -1019,7 +1019,7 @@ install_main() {
     if [[ "${GPIOconfig}" == "YES" ]]; then
         # Use a venv as Bookworm implemented PEP668 https://stackoverflow.com/a/75696359
         sudo python3 -m venv .venv
-        sudo source .venv/bin/activate
+        source .venv/bin/activate
         sudo python3 -m pip install --upgrade --force-reinstall -q -r "${jukebox_dir}"/requirements-GPIO.txt
         sudo systemctl enable phoniebox-gpio-control.service
         if [[ ! -f "${jukebox_dir}"/settings/gpio_settings.ini ]]; then