diff --git a/install.sh b/install.sh index 8c249ea..45aa1a3 100755 --- a/install.sh +++ b/install.sh @@ -2,7 +2,7 @@ # copy files to installation directories cmake --install build --prefix /usr --config Release -v # Done as an install action by the debian package. -sudo /usr/bin/pipedalconfig --install -# copy pipedalPluginProfile as well. -sudo cp build/src/pipedalProfilePlugin /usr/bin/pipedalProfilePlugin -chmod +X /usr/bin/pipedalProfilePlugin +sudo /usr/bin/oppedalconfig --install +# copy oppedalProfilePlugin as well. +sudo cp build/src/oppedalProfilePlugin /usr/bin/oppedalProfilePlugin +chmod +X /usr/bin/oppedalProfilePlugin diff --git a/run.sh b/run.sh index 5c83330..c615f4b 100755 --- a/run.sh +++ b/run.sh @@ -1,2 +1,2 @@ #!/bin/bash -build/src/pipedald "/etc/pipedal/config" "/etc/pipedal/react" "-port" "0.0.0.0:8080" +build/src/oppedald "/etc/oppedal/config" "/etc/oppedal/react" "-port" "0.0.0.0:8080" diff --git a/src/polkit-1/rules/10-pipedal-networkmanager.rules b/src/polkit-1/rules/10-pipedal-networkmanager.rules index f5fe4d2..a1f1758 100644 --- a/src/polkit-1/rules/10-pipedal-networkmanager.rules +++ b/src/polkit-1/rules/10-pipedal-networkmanager.rules @@ -1,6 +1,6 @@ -// grant NetworkManager dbus permissions (no-prompts) to the pipedald systemd service. +// grant NetworkManager dbus permissions (no-prompts) to the oppedald systemd service. polkit.addRule(function(action, subject) { - if (action.id.indexOf("org.freedesktop.NetworkManager.") == 0 && subject.isInGroup("pipedal_d")) { + if (action.id.indexOf("org.freedesktop.NetworkManager.") == 0 && subject.isInGroup("oppedal_d")) { return polkit.Result.YES; } }); \ No newline at end of file diff --git a/src/templates/30-pipedal-p2p-dnsmasq-nm.conf b/src/templates/30-pipedal-p2p-dnsmasq-nm.conf index 88e629b..fd5da8b 100644 --- a/src/templates/30-pipedal-p2p-dnsmasq-nm.conf +++ b/src/templates/30-pipedal-p2p-dnsmasq-nm.conf @@ -5,7 +5,7 @@ interface=p2p-${WLAN}-* port=0 dhcp-range=192.168.60.20,192.168.60.127,15m domain=local - address=/pipedal-p2p.local/192.168.60.2 + address=/oppedal-p2p.local/192.168.60.2 except-interface=eth0 except-interface=${WLAN} diff --git a/src/templates/30-pipedal-p2p.conf b/src/templates/30-pipedal-p2p.conf index fe1b86f..8da0714 100644 --- a/src/templates/30-pipedal-p2p.conf +++ b/src/templates/30-pipedal-p2p.conf @@ -5,7 +5,7 @@ server=8.8.4.4 interface=p2p-wlan0-0 dhcp-range=192.168.60.3,192.168.60.127,15m domain=local - address=/pipedal.local/192.168.60.2 + address=/oppedal.local/192.168.60.2 except-interface=eth0 except-interface=wlan0 diff --git a/src/templates/dnsmasq-pipedal-nm.conf b/src/templates/dnsmasq-pipedal-nm.conf index e6d3394..114a15f 100644 --- a/src/templates/dnsmasq-pipedal-nm.conf +++ b/src/templates/dnsmasq-pipedal-nm.conf @@ -1,9 +1,9 @@ -# PiPedal dnsmasq settings for p2p +# OP-Pedal dnsmasq settings for p2p #disable dns, dhcp only." port=0 dhcp-range=192.168.60.3,192.168.60.127,15m domain=local -address=/pipedal-p2p.local/192.168.60.2 +address=/oppedal-p2p.local/192.168.60.2 # defensive. Not actually required. except-interface=eth0 diff --git a/src/templates/jack.service.template b/src/templates/jack.service.template index 5c56805..f6281c2 100644 --- a/src/templates/jack.service.template +++ b/src/templates/jack.service.template @@ -3,7 +3,7 @@ Description=Jack Audio Daemon After=sound.target After=local-fs.target After=dbus.socket -After=pipedald +After=oppedald [Service] diff --git a/src/templates/pipedal_nm_p2pd.service.template b/src/templates/pipedal_nm_p2pd.service.template index 79df5e8..9ba43c7 100644 --- a/src/templates/pipedal_nm_p2pd.service.template +++ b/src/templates/pipedal_nm_p2pd.service.template @@ -1,5 +1,5 @@ [Unit] -Description=PiPedal P2P Session Manager +Description=OP-Pedal P2P Session Manager After=network.target After=nss-lookup.target After=wpa_supplicant.service @@ -11,7 +11,7 @@ StartLimitBurst=8 [Service] ExecStart=${COMMAND} --systemd --loglevel info Type=notify -WorkingDirectory=/var/pipedal +WorkingDirectory=/var/oppedal Restart=on-failure TimeoutStopSec=5 RestartSec=5s diff --git a/src/templates/pipedal_p2pd.conf.template b/src/templates/pipedal_p2pd.conf.template index 9b175ee..d746523 100644 --- a/src/templates/pipedal_p2pd.conf.template +++ b/src/templates/pipedal_p2pd.conf.template @@ -21,9 +21,9 @@ wifiChannel=${WIFI_CHANNEL} # UI use only. service state is authoritative. enabled=${ENABLED} # P2P Device info -p2p_model_name=PiPedal +p2p_model_name=OP-Pedal p2p_model_number=1 -p2p_manufacturer="The PiPedal Project" +p2p_manufacturer="The OP-Pedal Project" p2p_serial_number=1 p2p_device_type=1-0050F204-1 @@ -39,6 +39,6 @@ p2p_go_he=0 service_guid_file=${INSTANCE_ID_FILE} -# GUID identifying the PiPedal service +# GUID identifying the OP-Pedal service # (if service_guid_file is not provided.) service_guid= diff --git a/src/templates/pipedal_p2pd.service.template b/src/templates/pipedal_p2pd.service.template index 402c271..b2c4223 100644 --- a/src/templates/pipedal_p2pd.service.template +++ b/src/templates/pipedal_p2pd.service.template @@ -1,5 +1,5 @@ [Unit] -Description=PiPedal P2P Session Manager +Description=OP-Pedal P2P Session Manager After=network.target After=nss-lookup.target After=wpa_supplicant.service @@ -10,7 +10,7 @@ StartLimitBurst=8 [Service] ExecStart=${COMMAND} --systemd --log-level info Type=notify -WorkingDirectory=/var/pipedal +WorkingDirectory=/var/oppedal TimeoutStopSec=5 Restart=on-failure RestartSec=10s diff --git a/src/templates/pipedaladmind.service.template b/src/templates/pipedaladmind.service.template index fc5afd4..61d9dd5 100644 --- a/src/templates/pipedaladmind.service.template +++ b/src/templates/pipedaladmind.service.template @@ -6,7 +6,7 @@ After=network.target ExecStart=${COMMAND} Restart=always RestartSec=60 -WorkingDirectory=/var/pipedal +WorkingDirectory=/var/oppedal TimeoutStopSec=15 KillMode=process diff --git a/src/templates/pipedald.service.template b/src/templates/pipedald.service.template index aafd6f0..7bd8fc1 100644 --- a/src/templates/pipedald.service.template +++ b/src/templates/pipedald.service.template @@ -13,14 +13,14 @@ LimitMEMLOCK=infinity LimitRTPRIO=95 Nice=-9 ExecStart=${COMMAND} -User=pipedal_d -Group=pipedal_d +User=oppedal_d +Group=oppedal_d Restart=always TimeoutStartSec=60 NotifyAccess=all RestartSec=5 TimeoutStopSec=15 -WorkingDirectory=/var/pipedal +WorkingDirectory=/var/oppedal [Install] diff --git a/uninstall.sh b/uninstall.sh index d3b937f..919f581 100755 --- a/uninstall.sh +++ b/uninstall.sh @@ -2,9 +2,9 @@ # CMake doesn't have an uninstall option, so remove files manually. export PREFIX=/usr -rm $PREFIX/bin/pipedal* -rm $PREFIX/sbin/pipedal* -rm -rf /etc/pipedal/ -rm -rf /var/pipedal/ +rm $PREFIX/bin/oppedal* +rm $PREFIX/sbin/oppedal* +rm -rf /etc/oppedal/ +rm -rf /var/oppedal/ rm -rf /usr/lib/lv2/ToobAmp.lv2/