Skip to content

Commit

Permalink
Subroutine merge: 2: move install configs from /usr/share/configs/ to…
Browse files Browse the repository at this point in the history
… /usr/share/probe_basic/configs/
  • Loading branch information
dpslwk committed Dec 2, 2023
1 parent b370730 commit e074e0a
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion debian/postinst
Original file line number Diff line number Diff line change
Expand Up @@ -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/"
Expand Down
4 changes: 2 additions & 2 deletions debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit e074e0a

Please sign in to comment.