Subroutine merge: 2: move install configs from /usr/share/configs/ to…

… /usr/share/probe_basic/configs/
kcjengr · Dec 7, 2023 · 5b94f53 · 5b94f53
1 parent 65afd4f
commit 5b94f53
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/debian/postinst b/debian/postinst
@@ -13,7 +13,7 @@ sudo -u ${SUDO_USER:-$USER} mkdir -p "${TARGET_HOME}linuxcnc"
 sudo -u ${SUDO_USER:-$USER} mkdir -p "${TARGET_HOME}.local/usr/share/icons"
 
 # Copy the probe_basic_sims directory to the target directory
-sudo -u ${SUDO_USER:-$USER} cp -r /usr/share/configs "${TARGET_HOME}linuxcnc/"
+sudo -u ${SUDO_USER:-$USER} cp -r /usr/share/probe_basic/configs "${TARGET_HOME}linuxcnc/"
 
 # Copy the probe_basic icons directory to the target directory
 sudo -u ${SUDO_USER:-$USER} cp -r /usr/share/icons/probe_basic_icon.png "${TARGET_HOME}.local/usr/share/icons/"

diff --git a/debian/rules b/debian/rules
@@ -20,9 +20,9 @@ override_dh_auto_install:
 	cp -r src/probe_basic/images/probe_basic_icon_lathe.png debian/python3-probe-basic/usr/share/icons/
 
 	# create configs directory if it doesn't exist
-	mkdir -p debian/python3-probe-basic/usr/share/configs/
+	mkdir -p debian/python3-probe-basic/usr/share/probe_basic/configs/
 	# Install the config file contents
-	cp -r linuxcnc/configs debian/python3-probe-basic/usr/share/
+	cp -r linuxcnc/configs debian/python3-probe-basic/usr/share/probe_basic/
 
 
 override_dh_install: