~mterry/ubuntu-touch-session/pulse-in-snap

« back to all changes in this revision

Viewing changes to upstart-session/pulseaudio.conf

  • Committer: Michael Terry
  • Date: 2016-11-15 15:00:21 UTC
  • Revision ID: mike@mterry.name-20161115150021-0vgep13udwpp2y7r
Use .local/share/pulse instead of etc/pulse inside SNAP_USER_DATA in case we're using that for HOME too, like we do in u8 snap

Show diffs side-by-side

added added

removed removed

Lines of Context:
11
11
    # Use the Touch specific Pulseaudio script file
12
12
    if [ -n "$SNAP" ]; then
13
13
        # We need to fix hardcoded paths to point into our snap
14
 
        if ! grep -q $SNAP $SNAP_USER_DATA/etc/pulse/touch.pa; then
15
 
            mkdir -p $SNAP_USER_DATA/etc/pulse
16
 
            sed "s|/etc/|$SNAP/etc/|g" $SNAP/etc/pulse/touch.pa >$SNAP_USER_DATA/etc/pulse/touch.pa
 
14
        if ! grep -q $SNAP $SNAP_USER_DATA/.local/share/pulse/touch.pa; then
 
15
            mkdir -p $SNAP_USER_DATA/.local/share/pulse
 
16
            sed "s|/etc/|$SNAP/etc/|g" $SNAP/etc/pulse/touch.pa >$SNAP_USER_DATA/.local/share/pulse/touch.pa
17
17
        fi
18
 
        initctl set-env --global PULSE_SCRIPT=$SNAP_USER_DATA/etc/pulse/touch.pa
 
18
        initctl set-env --global PULSE_SCRIPT=$SNAP_USER_DATA/.local/share/pulse/touch.pa
19
19
    else
20
20
        initctl set-env --global PULSE_SCRIPT=/etc/pulse/touch.pa
21
21
    fi