Fix user-fix script

It was still referring to the now non existent webcamd, causing
it to fail and thus become non functional.

Author: foosel

scripts/80-install-user-fix

@@ -6,9 +6,6 @@ export LC_ALL=C
 source /common.sh
 install_cleanup_trap
 
-# if we already have the user-fix installed, we don't need to do anything
-[ -f '/root/bin/user-fix' ] && exit 0
-
 # we need to install virtualenv-tools3, so let's get pip and that
 apt install -y python3-pip
 sudo -u pi pip3 install --user virtualenv-tools3

scripts/files/user-fix

@@ -14,7 +14,7 @@ if [ "$CURRENT" = "pi" -a "$FIRSTUSER" != "pi" ]; then
 
     # first we need to figure out if we can use the new user name in systemd files
     # directly or if we need to use the UID - we do that by checking if the
-    # escaped name differes from the plain name, if so something is non ASCII
+    # escaped name differs from the plain name, if so something is non ASCII
     # and the UID is the safer bet
     FIRSTUSERESC=`systemd-escape "$FIRSTUSER"`
     if [ "$FIRSTUSER" != "$FIRSTUSERESC" ]; then
@@ -29,6 +29,11 @@ if [ "$CURRENT" = "pi" -a "$FIRSTUSER" != "pi" ]; then
     sed -i "s!ExecStart=/home/pi/!ExecStart=$FIRSTUSERHOME/!g" /etc/systemd/system/octoprint.service
     systemctl daemon-reload
 
+    # fix virtualenv
+    echo "Fixing paths in virtual environment"
+    cd $FIRSTUSERHOME/oprint
+    sudo -u $FIRSTUSER $FIRSTUSERHOME/.local/bin/virtualenv-tools --update-path $FIRSTUSERHOME/oprint
+
     # fix sudoers files
     echo "Fixing sudoers"
     sed -i "s!^pi!$FIRSTUSER!g" /etc/sudoers.d/octoprint-service
@@ -39,12 +44,6 @@ if [ "$CURRENT" = "pi" -a "$FIRSTUSER" != "pi" ]; then
     sed -i "s!/home/pi/!$FIRSTUSERHOME/!g" $FIRSTUSERHOME/scripts/add-octoprint-checkout
     sed -i "s!/home/pi/!$FIRSTUSERHOME/!g" $FIRSTUSERHOME/scripts/welcome
     sed -i "s!/home/pi/!$FIRSTUSERHOME/!g" $FIRSTUSERHOME/.bashrc
-    sed -i "s!/home/pi/!$FIRSTUSERHOME/!g" /root/bin/webcamd
-
-    # fix virtualenv
-    echo "Fixing paths in virtual environment"
-    cd $FIRSTUSERHOME/oprint
-    sudo -u $FIRSTUSER $FIRSTUSERHOME/.local/bin/virtualenv-tools --update-path $FIRSTUSERHOME/oprint
 
     # finally, reboot for all of this to actually take affect
     echo "Adjusted scripts to new user, restarting services..."