Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add the klippy/extras to the klipper/.git/info/exclude so they do not… #101

Closed
wants to merge 1 commit into from
Closed

add the klippy/extras to the klipper/.git/info/exclude so they do not… #101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions installer-deb.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,11 +68,17 @@ install_services() {
install_guppy_goodies() {
printf "${green}Setting up Guppy Macros ${white}\n"
if [ ! -f $GCODE_SHELL_CMD ]; then
printf "${green}Installing gcode_shell_command.py for klippy ${white}\n"
cp $GUPPY_DIR/k1_mods/gcode_shell_command.py $GCODE_SHELL_CMD
printf "${green}Installing gcode_shell_command.py for klippy ${white}\n"
cp $GUPPY_DIR/k1_mods/gcode_shell_command.py $GCODE_SHELL_CMD
if ! grep -q "klippy/extras/gcode_shell_command.py" "$KLIPPER_PATH/.git/info/exclude"; then
echo "klippy/extras/gcode_shell_command.py" >> "$KLIPPER_PATH/.git/info/exclude"
fi
fi

cp $GUPPY_DIR/k1_mods/calibrate_shaper_config.py $SHAPER_CONFIG
if ! grep -q "klippy/extras/calibrate_shaper_config.py" "$KLIPPER_PATH/.git/info/exclude"; then
echo "klippy/extras/calibrate_shaper_config.py" >> "$KLIPPER_PATH/.git/info/exclude"
fi

mkdir -p $CONFIG_DIR/GuppyScreen/scripts
sed -i "s|<CONFIG_DIR>|$CONFIG_DIR|g; s|<KLIPPER_PATH>|$KLIPPER_PATH|g" $GUPPY_DIR/debian/guppy_cmd.cfg
Expand Down
11 changes: 11 additions & 0 deletions installer.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,9 @@ printf "${green}Setting up Guppy Macros ${white}\n"
if [ ! -f $GCODE_SHELL_CMD ]; then
printf "${green}Installing gcode_shell_command.py for klippy ${white}\n"
cp $K1_GUPPY_DIR/k1_mods/gcode_shell_command.py $GCODE_SHELL_CMD
if ! grep -q "klippy/extras/gcode_shell_command.py" "$KLIPPER_PATH/.git/info/exclude"; then
echo "klippy/extras/gcode_shell_command.py" >> "$KLIPPER_PATH/.git/info/exclude"
fi
fi

mkdir -p $K1_CONFIG_DIR/GuppyScreen/scripts
Expand Down Expand Up @@ -179,11 +182,19 @@ printf "${green}Setting up GuppyScreen ${white}\n"
cp $K1_GUPPY_DIR/k1_mods/S99guppyscreen /etc/init.d/S99guppyscreen

cp $K1_GUPPY_DIR/k1_mods/calibrate_shaper_config.py $SHAPER_CONFIG
if ! grep -q "klippy/extras/calibrate_shaper_config.py" "$KLIPPER_PATH/.git/info/exclude"; then
echo "klippy/extras/calibrate_shaper_config.py" >> "$KLIPPER_PATH/.git/info/exclude"
fi

ln -sf $K1_GUPPY_DIR/k1_mods/guppy_module_loader.py $KLIPPY_EXTRA_DIR/guppy_module_loader.py
ln -sf $K1_GUPPY_DIR/k1_mods/guppy_config_helper.py $KLIPPY_EXTRA_DIR/guppy_config_helper.py
ln -sf $K1_GUPPY_DIR/k1_mods/tmcstatus.py $KLIPPY_EXTRA_DIR/tmcstatus.py

for file in guppy_module_loader.py guppy_config_helper.py tmcstatus.py; do
if ! grep -q "klippy/extras/${file}" "$KLIPPER_PATH/.git/info/exclude"; then
echo "klippy/extras/$file" >> "$KLIPPER_PATH/.git/info/exclude"
fi
done

if [ ! -d "/usr/lib/python3.8/site-packages/matplotlib-2.2.3-py3.8.egg-info" ]; then
echo "Not replacing mathplotlib ft2font module. PSD graphs might not work"
Expand Down
Loading