Linux + iPhone Continuity / iMessage / SMS
fix: don't install ufw and firewalld rules if they are not installed
Zack Bartel5db9b4a65d82
diff --git a/CMakeLists.txt b/CMakeLists.txtindex 3578e71..e49aba1 100644--- a/CMakeLists.txt+++ b/CMakeLists.txt@@ -149,11 +149,25 @@ install(FILES packaging/systemd/[email protected]# firewall profiles for the mTLS listener (5134/tcp) and mDNS (5353/udp) installed but not applied (user's call).set(UFW_APPLICATIONS_DIR "/etc/ufw/applications.d" CACHE PATH "ufw application profile directory")set(FIREWALLD_SERVICE_DIR "lib/firewalld/services" CACHE PATH "firewalld service directory")-install(FILES packaging/firewall/tether.ufw- DESTINATION "${UFW_APPLICATIONS_DIR}"- RENAME tether)-install(FILES packaging/firewall/tether.xml- DESTINATION "${FIREWALLD_SERVICE_DIR}")+# write them only where the directory already exists+function(install_if_dir_exists src dir name)+ install(CODE "+ set(_dir \"${dir}\")+ if(NOT IS_ABSOLUTE \"\${_dir}\")+ set(_dir \"\${CMAKE_INSTALL_PREFIX}/\${_dir}\")+ endif()+ if(NOT \"\$ENV{DESTDIR}\" STREQUAL \"\" OR IS_DIRECTORY \"\${_dir}\")+ file(INSTALL DESTINATION \"\${_dir}\" TYPE FILE RENAME \"${name}\" FILES \"${src}\")+ else()+ message(STATUS \"Skipping \${_dir}/${name}: directory not present\")+ endif()+ ")+endfunction()++install_if_dir_exists("${CMAKE_CURRENT_SOURCE_DIR}/packaging/firewall/tether.ufw"+ "${UFW_APPLICATIONS_DIR}" tether)+install_if_dir_exists("${CMAKE_CURRENT_SOURCE_DIR}/packaging/firewall/tether.xml"+ "${FIREWALLD_SERVICE_DIR}" tether.xml)# Extension Building only if npm is availablediff --git a/docs/man/man8/tetherd.8.in b/docs/man/man8/tetherd.8.inindex 3e8ee5e..66fcc82 100644--- a/docs/man/man8/tetherd.8.in+++ b/docs/man/man8/tetherd.8.in@@ -21,7 +21,9 @@ discovers this machine and then cannot reach it.Profiles for \fBufw\fR(8) and \fBfirewalld\fR(1) are installed but neverapplied; run \fBufw allow Tether\fR or-\fBfirewall-cmd --permanent --add-service=tether\fR to use them.+\fBfirewall-cmd --permanent --add-service=tether\fR to use them. A source+install writes each profile only if that tool's directory already exists;+packages always carry both..SH FILES.TP\fB/etc/ufw/applications.d/tether\fR