Browse Source

Rename xinit script to match best practices

Dash after number provides visual clarity,
and .sh suffix helps text editors with file
extension-based syntax highlighting engines.
tags/v0.9.2
ratijas Filipe Coelho <falktx@falktx.com> 3 years ago
parent
commit
9bc418cfb2
3 changed files with 10 additions and 6 deletions
  1. +7
    -5
      Makefile
  2. +2
    -0
      data/61-cadence-session-inject.sh
  3. +1
    -1
      data/cadence-session-start

+ 7
- 5
Makefile View File

@@ -164,7 +164,7 @@ install:
# Install addtional stuff for Cadence
install -m 644 data/pulse2jack/* $(DESTDIR)$(PREFIX)/share/cadence/pulse2jack/
install -m 644 data/pulse2loopback/* $(DESTDIR)$(PREFIX)/share/cadence/pulse2loopback/
install -m 755 data/61cadence-session-inject $(X11_RC_DIR)
install -m 755 data/61-cadence-session-inject.sh $(X11_RC_DIR)

# Install addtional stuff for Claudia
cp -r data/icons/* $(DESTDIR)$(PREFIX)/share/cadence/icons/
@@ -184,10 +184,11 @@ install:
$(DESTDIR)$(PREFIX)/bin/catia \
$(DESTDIR)$(PREFIX)/bin/claudia \
$(DESTDIR)$(PREFIX)/bin/claudia-launcher \
$(X11_RC_DIR)/61cadence-session-inject
$(X11_RC_DIR)/61-cadence-session-inject.sh

# Delete old files
# Delete old scripts
rm -f $(X11_RC_DIR)/21cadence-session-inject
rm -f $(X11_RC_DIR)/61cadence-session-inject
rm -f $(X11_RC_DIR)/70cadence-plugin-paths
rm -f $(X11_RC_DIR)/99cadence-session-start

@@ -214,10 +215,11 @@ uninstall:
rm -f $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps/claudia.svg
rm -f $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps/claudia-launcher.svg
rm -f $(DESTDIR)/etc/xdg/autostart/cadence-session-start.desktop
rm -f $(X11_RC_DIR)/61cadence-session-inject
rm -f $(X11_RC_DIR)/61-cadence-session-inject.sh
rm -rf $(DESTDIR)$(PREFIX)/share/cadence/

# Old stuff
# Delete old scripts
rm -f $(X11_RC_DIR)/21cadence-session-inject
rm -f $(X11_RC_DIR)/61cadence-session-inject
rm -f $(X11_RC_DIR)/70cadence-plugin-paths
rm -f $(X11_RC_DIR)/99cadence-session-start

data/61cadence-session-inject → data/61-cadence-session-inject.sh View File

@@ -1,3 +1,5 @@
#!/bin/sh

# Cadence Session Startup Injection
# Set plugin paths and start JACK (or not) according to user settings


+ 1
- 1
data/cadence-session-start View File

@@ -9,7 +9,7 @@ fi
INSTALL_PREFIX="X-PREFIX-X"

if [ "$1"x == "--system-start-by-x11-startup"x ]; then
# called via $STARTUP in 21cadence-session-inject
# called via $STARTUP in 61-cadence-session-inject.sh
$PYTHON $INSTALL_PREFIX/share/cadence/src/cadence_session_start.py --system-start &
shift
if [ "$1"x != ""x ]; then


Loading…
Cancel
Save