From e074e0a116e860e0ddfdd31923224b433456ad7d Mon Sep 17 00:00:00 2001 From: dpslwk Date: Sun, 12 Nov 2023 15:47:28 +0000 Subject: [PATCH] Subroutine merge: 2: move install configs from /usr/share/configs/ to /usr/share/probe_basic/configs/ --- debian/postinst | 2 +- debian/rules | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/postinst b/debian/postinst index 50af9d8c..79892fd1 100755 --- 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 index b27110da..42a5eee5 100755 --- 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: