diff --git a/CMakeLists.txt b/CMakeLists.txt index 29e1065439fd78ce5486d99f8b6a9148a44baa23..b5bfe198dfcafc96c928cf98e65c3a2671ac4559 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -90,7 +90,7 @@ IF (UNIX) SET(CPACK_DEBIAN_PACKAGE_MAINTAINER "labrobotica - labrobotica@iri.upc.edu") # Uncomment to add the necessary mantainer scripts - SET(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${CMAKE_SOURCE_DIR}/scripts/debian/postinst;${CMAKE_SOURCE_DIR}/scripts/debian/prerm") + SET(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${CMAKE_SOURCE_DIR}/scripts/hello_world;${CMAKE_SOURCE_DIR}/scripts/debian/postinst;${CMAKE_SOURCE_DIR}/scripts/debian/preinst;${CMAKE_SOURCE_DIR}/scripts/debian/postrem;${CMAKE_SOURCE_DIR}/scripts/debian/prerm") # Uncomment to add dependencies comma separated # SET(CPACK_DEBIAN_PACKAGE_DEPENDS "iri-<package_name>-dev (>= 1.0~${DISTRIB})") diff --git a/scripts/debian/postinst b/scripts/debian/postinst old mode 100644 new mode 100755 index cb95760b63e2525dcbd92f5c537ec2f674b8431c..abcfede0ad25c50075200aad950972a70a61363f --- a/scripts/debian/postinst +++ b/scripts/debian/postinst @@ -4,12 +4,14 @@ set -e case "$1" in configure) + #echo " Calling script" + #/var/lib/dpkg/info/iri-comm-dev.hello_world echo " Addind user to dialout group..." sudo usermod -a -G dialout $SUDO_USER echo " Done." - echo " Adding ftdi udev rule..." + echo " Adding 99-iri-comm-ftdi udev rule..." - FILE="/etc/udev/rules.d/99-ftdi.rules" + FILE="/lib/udev/rules.d/99-iri-comm-ftdi.rules" LINE0="#The following line allow the users on dialout to access SUBSYSTEM:VENDOR:PRODUCT=usb|usb_device:0403:6001 devices" LINE1="SUBSYSTEM==\"usb|usb_device\", ATTRS{idVendor}==\"0403\", ATTRS{idProduct}==\"6001\", GROUP=\"dialout\"" @@ -19,7 +21,17 @@ case "$1" in sudo udevadm control --reload-rules sudo service udev restart - echo " Done. Need to unplug-plug devices for changes to take effect" + echo " Done. It's necessary to unplug-plug devices for changes to take effect." + + echo " Adding iri-scripts-path.sh to /etc/profile.d..." + FILE="/etc/profile.d/iri-scripts-path.sh" + sudo echo "# Expand PATH to include the directory where IRI scripts go." > $FILE + sudo echo "iri_script_path=\"/usr/share/iri\"" >> $FILE + sudo echo "if [ -n \"\${PATH##*\${iri_script_path}}\" -a -n \"\${PATH##*\${iri_script_path}:*}\" ]; then" >> $FILE + sudo echo " export PATH=\$PATH:\${iri_script_path}" >> $FILE + sudo echo "fi" >> $FILE + echo " Done. It's necessary a log out for changes to take effect." + ;; abort-upgrade) @@ -33,6 +45,9 @@ case "$1" in esac # usermod -a -G dialout $SUDO_USER +# deluser $SUDO_USER dialout + +# # echo "SUBSYSTEM==\"usb|usb_device\", ATTRS{idVendor}==\"0403\", ATTRS{idProduct}==\"6001\", GROUP=\"dialout\"" > /etc/udev/rules.d/99-ftdi.rules diff --git a/scripts/debian/prerm b/scripts/debian/prerm index 05ba2b220f8cf28e1dd147b4740db4888a94fc75..0ad26db1be77a2bef43d6c0f40dab52d02e1dfe8 100644 --- a/scripts/debian/prerm +++ b/scripts/debian/prerm @@ -4,18 +4,14 @@ set -e case "$1" in remove) - # echo " Removing ftdi udev rule..." - # FILE="/etc/udev/rules.d/99-ftdi.rules" + echo " Removing 99-iri-comm-ftdi udev rule..." + FILE="/lib/udev/rules.d/99-iri-comm-ftdi.rules" + sudo rm -f $FILE - # sudo sed -i -E "/SUBSYSTEM.*usb.usb_device.*idVendor.*0403.*idProduct.*6001.*GROUP.*dialout\"/d" $FILE - # sudo sed -i -E "/#The following line allow the users on dialout to access SUBSYSTEM:VENDOR:PRODUCT=usb|usb_device:0403:6001 devices/d" $FILE + sudo udevadm control --reload-rules + sudo service udev restart + echo " Done. Need to unplug-plug devices for changes to take effect" - # sudo udevadm control --reload-rules - # sudo service udev restart - # echo " Done. Need to unplug-plug devices for changes to take effect" - - echo "---=== WARNING: The user continues on the dialout group. Remove it if necessary. ===---" - echo "---=== WARNING: The ftdi udev rule wasn't removed from 99-ftdi.rules. Remove it if necessary. ===---" ;; upgrade) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 82b374d9885d2f36c042d04e24d4fcaa98aed09b..ca972d612c6ecb0b8addf682ea4f6e39d4607492 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -88,4 +88,10 @@ INSTALL(FILES ${ftdi_local_dir}/WinTypes.h DESTINATION include) INSTALL(FILES ${FTDI_LIBRARY} DESTINATION lib) INSTALL(FILES ${FTDI_LIBRARY}.${FTDI_VER} DESTINATION lib) ENDIF(INSTALL_FTDI) + +INSTALL(FILES ../scripts/can.sh + DESTINATION share/iri + PERMISSIONS OWNER_EXECUTE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_READ WORLD_EXECUTE) + + ADD_SUBDIRECTORY(examples)