Adding 40-sound

luwrain · Oct 6, 2022 · b2138fd · b2138fd
1 parent e5adc4f
commit b2138fd
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 28 deletions.
diff --git a/ubuntu/22.04/dist/bin/luwrain b/ubuntu/22.04/dist/bin/luwrain
diff --git a/ubuntu/22.04/dist/bin/lwr b/ubuntu/22.04/dist/bin/lwr
diff --git a/ubuntu/22.04/dist/profile/.xbindkeysrc b/ubuntu/22.04/dist/profile/.xbindkeysrc
@@ -1,5 +1,5 @@
 
 "pactl set-sink-volume 0 -10%" 
  XF86AudioLowerVolume
-"pactl set-sink-volume 0 -10%" 
+"pactl set-sink-volume 0 +10%" 
  XF86AudioRaiseVolume
diff --git a/ubuntu/22.04/scripts/scripts.d/10-packages b/ubuntu/22.04/scripts/scripts.d/10-packages
@@ -3,7 +3,7 @@ install-pkg acpi ntfs-3g smartmontools udisks2 cpufrequtils
 install-pkg unrar zip p7zip-full
 install-pkg curl wget net-tools openssh-server fetchmail procmail unattended-upgrades bluez-tools
 #install-pkg dvd+rw-tools growisofs
-install-pkg openjdk-18-jre openjfx
+install-pkg openjfx #openjdk-18-jre 
 install-pkg gcc gdb make git
 install-pkg yasr xterm
 install-pkg lame sox mpg123 mplayer xbindkeys vorbis-tools geeqie

diff --git a/ubuntu/22.04/scripts/scripts.d/11-dist b/ubuntu/22.04/scripts/scripts.d/11-dist
@@ -5,14 +5,5 @@ find ./dist -name .gitignore -delete
 [ -d ./dist/bin ] && cp -r ./dist/bin/. $LWRISO_ROOT/usr/local/bin/ ||:
 [ -d ./dist/sbin ] && cp -r ./dist/sbin/. $LWRISO_ROOT/sbin/ ||:
 
-#pushd $LWRISO_ROOT/opt
-#if ! [ -e luwrain ]; then
-# wget -q "http:https://download.luwrain.org/nightly/latest/$(latest-iso)"
-# tar xf luwrain*.tar.gz
-# rm -f luwrain*.tar.gz
-# mv luwrain-iso* luwrain
-# pushd luwrain/jar 
-# wget -q https://download.luwrain.org/jni/luwrain-jni-ubuntu-21.10-x64.jar
-# popd
-#fi
-#popd
+install-pkg luwrain
+ln -s luwrain-base-1.9.3.jar $LWRISO_ROOT/usr/share/luwrain/jar/luwrain-base.jar
diff --git a/ubuntu/22.04/scripts/scripts.d/21-system-start b/ubuntu/22.04/scripts/scripts.d/21-system-start
@@ -9,15 +9,15 @@ cat <<EOF > $LWRISO_ROOT/etc/luwrain/system-start
 
 bt-agent-d --capability=NoInputNoOutput
 
-if [ -r /etc/luwrain/system-start/default-user ]; then
- USER=\$(cat /etc/luwrain/system-start/default-user)
+if [ -r /etc/luwrain/default-user ]; then
+ USER="\$(cat /etc/luwrain/default-user)"
 fi
 
 if [ -z "\$USER" ]; then
 USER=$LWRISO_USER
 fi
 
-/bin/su - \$USER -c /usr/bin/startx
+/bin/su - "\$USER" -c /usr/bin/startx
 EOF
 
 chmod 755 $LWRISO_ROOT/etc/luwrain/system-start

diff --git a/ubuntu/22.04/scripts/scripts.d/40-sound b/ubuntu/22.04/scripts/scripts.d/40-sound
@@ -0,0 +1,18 @@
+
+cat <<EOF > $LWRISO_ROOT/etc/asound.conf
+pcm.!default {
+ type pulse
+}
+
+ctl.!default {
+ type pulse
+}
+EOF
+
+cat <<EOF >> $LWRISO_ROOT/etc/java-*openjdk/sound.properties
+
+javax.sound.sampled.Clip=com.sun.media.sound.DirectAudioDeviceProvider
+javax.sound.sampled.Port=com.sun.media.sound.PortMixerProvider
+javax.sound.sampled.SourceDataLine=com.sun.media.sound.DirectAudioDeviceProvider
+javax.sound.sampled.TargetDataLine=com.sun.media.sound.DirectAudioDeviceProvider
+EOF
diff --git a/ubuntu/22.04/scripts/scripts.d/60-xinitrc b/ubuntu/22.04/scripts/scripts.d/60-xinitrc
@@ -5,7 +5,7 @@ mkdir -p $LWRISO_ROOT/home/$LWRISO_USER/.local/bin
 cat <<EOF > $LWRISO_ROOT/home/$LWRISO_USER/.local/bin/dwm-autolaunch
 #!/bin/bash -e
 
-exec lwr
+exec lwr --speech=voiceman
 EOF
 chmod 755 $LWRISO_ROOT/home/$LWRISO_USER/.local/bin/dwm-autolaunch
 
@@ -33,14 +33,14 @@ export VOICEMAN_EMACSPEAK_RATE_FRACTION=2
 export VOICEMAN_LIBAO_DRIVER=alsa
 
 pulseaudio -D ||:
-#pactl set-sink-volume 0 80%
 
 if ! [ -e /tmp/voiceman.socket ]; then
  /usr/bin/voicemand -d
 fi
 
 setxkbmap -layout "us,ru"
 setxkbmap -option "grp:caps_toggle,grp_led:scroll"
+xbindkeys
 
 exec dwm-luwrain
 EOF