Fixed paths for config files in the Snap

Fixes #121

- Fixed path for ipp-usb.conf
- Let ipp-usb use its own quirk files right from the immutable file system and also a user-supplied quirk file in the writable area.
- Do not copy over quirk files any more

Author: tillkamppeter

snap/local/run-ipp-usb

@@ -10,12 +10,11 @@ mkdir -p $SNAP_COMMON/var/lock || :
 mkdir -p $SNAP_COMMON/var/dev || :
 mkdir -p $SNAP_COMMON/quirks || :
 
-# Put config files in place
+# Put config file in place
 #
 # Do not overwrite files and ignore errors, to not reset user configuration
 # when running as root and to not have ugly error messages when running as
 # non-root.
-yes no | cp -i $SNAP/usr/share/ipp-usb/quirks/* $SNAP_COMMON/quirks >/dev/null 2>&1 || :
 if [ ! -f $SNAP_COMMON/etc/ipp-usb.conf ]; then
     cp $SNAP/etc/ipp-usb.conf $SNAP_COMMON/etc/ >/dev/null 2>&1 || :
 fi

snap/local/run-ipp-usb-server

@@ -9,8 +9,7 @@ mkdir -p $SNAP_COMMON/var/lock
 mkdir -p $SNAP_COMMON/var/dev
 mkdir -p $SNAP_COMMON/quirks
 
-# Put config files in place
-cp $SNAP/usr/share/ipp-usb/quirks/* $SNAP_COMMON/quirks
+# Put config file in place
 if [ ! -f $SNAP_COMMON/etc/ipp-usb.conf ]; then
     cp $SNAP/etc/ipp-usb.conf $SNAP_COMMON/etc/
 fi

snap/snapcraft.yaml

@@ -58,9 +58,10 @@ parts:
       # Not only the config file ipp-usb.conf will be put into a user-editable
       # space but also the quirks file, so that the user can add and debug
       # quirks
-      perl -p -i -e 's:/etc/:/var/snap/ipp-usb/common/etc/:' paths.go
+      perl -p -i -e 's:/etc/ipp-usb/quirks:/var/snap/ipp-usb/common/quirks:' paths.go
+      perl -p -i -e 's:/etc/ipp-usb:/var/snap/ipp-usb/common/etc:' paths.go
       perl -p -i -e 's:/var/ipp-usb:/var/snap/ipp-usb/common/var:' paths.go
-      perl -p -i -e 's:/usr/share/ipp-usb/quirks:/var/snap/hplip-printer-app/common/quirks:' paths.go
+      perl -p -i -e 's:/usr/share/ipp-usb/quirks:/snap/ipp-usb/usr/share/ipp-usb/quirks:' paths.go
       perl -p -i -e 's:/var/log/ipp-usb:/var/snap/ipp-usb/common/var/log:' paths.go
       # Build the executable
       craftctl default