diff -Naur salixtools-1.11.2/clocksetup/clocksetup salixtools-1.11.3/clocksetup/clocksetup --- salixtools-1.11.2/clocksetup/clocksetup 2017-12-29 11:43:53.000000000 +0100 +++ salixtools-1.11.3/clocksetup/clocksetup 2018-01-01 19:25:00.000000000 +0100 @@ -107,7 +107,7 @@ --menu \ "\n `eval_gettext 'Currently the clock is set to:'` \"$(date) ($zone)\" \ \n\n `eval_gettext 'Please choose an option:'`" \ - 16 80 5 \ + 0 0 0 \ "1" "`eval_gettext 'Set the time manually'`" \ "2" "`eval_gettext 'Set the date manually'`" \ "3" "`eval_gettext 'Set the time zone'`" \ @@ -155,7 +155,7 @@ TIMEZONES="" for i in $AVAILCONT; do for j in `find $ZONEINFO/$i -type f | sed "s|$ZONEINFO/||" | sort`; do - TIMEZONES="$TIMEZONES $j o" + TIMEZONES="$TIMEZONES $j" done done echo $TIMEZONES @@ -207,6 +207,7 @@ answer=$(${dialog} \ --stdout \ --default-item "$zone" \ + --no-items \ --ok-label "`eval_gettext 'OK'`" \ --cancel-label "`eval_gettext 'Cancel'`" \ --title "`eval_gettext 'Time zone configuration'`" \ diff -Naur salixtools-1.11.2/keyboardsetup/10-keymap.conf-template salixtools-1.11.3/keyboardsetup/10-keymap.conf-template --- salixtools-1.11.2/keyboardsetup/10-keymap.conf-template 2017-12-29 11:43:53.000000000 +0100 +++ salixtools-1.11.3/keyboardsetup/10-keymap.conf-template 2017-08-11 20:16:38.000000000 +0200 @@ -1,9 +1,10 @@ Section "InputClass" - Identifier "Keyboard settings" - MatchIsKeyboard "yes" - Driver "evdev" - Option "XkbLayout" "__XKBLAYOUT__" - Option "XkbVariant" "__XKBVARIANT__" - Option "XkbOptions" "__XKBOPTIONS__" + Identifier "Keyboard-all" + MatchIsKeyboard "yes" + MatchDevicePath "/dev/input/event*" + Driver "evdev" + Option "XkbLayout" "__XKBLAYOUT__" + Option "XkbVariant" "__XKBVARIANT__" + Option "XkbOptions" "__XKBOPTIONS__" EndSection diff -Naur salixtools-1.11.2/keyboardsetup/keyboardsetup salixtools-1.11.3/keyboardsetup/keyboardsetup --- salixtools-1.11.2/keyboardsetup/keyboardsetup 2017-12-29 11:43:53.000000000 +0100 +++ salixtools-1.11.3/keyboardsetup/keyboardsetup 2018-01-01 19:04:04.000000000 +0100 @@ -236,7 +236,7 @@ --ok-label \"`eval_gettext 'OK'`\" \ --cancel-label \"`eval_gettext 'Exit'`\" \ --menu \ - \"\\n `eval_gettext 'Please select your preferred keyboard map:'`\" 20 80 11 "$list" )" + \"\\n `eval_gettext 'Please select your preferred keyboard map:'`\" 0 0 0 "$list" )" # Don't do anything if Cancel or the close button was pressed retval=$? diff -Naur salixtools-1.11.2/keyboardsetup/keymaps salixtools-1.11.3/keyboardsetup/keymaps --- salixtools-1.11.2/keyboardsetup/keymaps 2017-12-29 11:43:53.000000000 +0100 +++ salixtools-1.11.3/keyboardsetup/keymaps 2018-01-02 15:52:06.290622798 +0100 @@ -43,14 +43,12 @@ et|et|| et-nodeadkeys|et|| fi-latin1|fi|| -fi-latin9|fi|| fi|fi|| fr-latin1|fr|| -fr-latin9|fr|oss| fr-pc|fr|| fr_CH-latin1|ch|fr| fr_CH|ch|fr| -fr|fr|oss| +fr|fr|| gr-pc|us,el||grp:alt_shift_toggle,grp_led:scroll gr|us,el||grp:alt_shift_toggle,grp_led:scroll hu|hu|| @@ -81,7 +79,6 @@ pl|pl|| pt|pt|| pt-latin1|pt|| -pt-latin9|pt|| pt-olpc|pt|| ro_win|ro_microsoft|| ru-cp1251|ru||grp:switch,grp:alt_shift_toggle,grp_led:scroll @@ -97,6 +94,7 @@ se-fi-lat6|se_FI|| se-ir209|se_SE|| se-lat6|se_SE|| +sv-latin1|se|| sg-latin1-lk450|sg|| sg-latin1|de_CH|| sg|de_CH|| diff -Naur salixtools-1.11.2/localesetup/localesetup salixtools-1.11.3/localesetup/localesetup --- salixtools-1.11.2/localesetup/localesetup 2017-12-29 11:43:53.000000000 +0100 +++ salixtools-1.11.3/localesetup/localesetup 2016-10-29 21:45:39.000000000 +0200 @@ -90,7 +90,7 @@ --cancel-label "`eval_gettext 'Exit'`" \ --menu \ \"\\n`eval_gettext 'The current locale is $currentlocale.'` \\n\\n\ -`eval_gettext 'Please select your preferred system language:'`\" 0 0 11 \ +`eval_gettext 'Please select your preferred system language:'`\" 0 0 0 \ "${list}" )" diff -Naur salixtools-1.11.2/netsetup/netsetup salixtools-1.11.3/netsetup/netsetup --- salixtools-1.11.2/netsetup/netsetup 2017-12-29 11:43:53.000000000 +0100 +++ salixtools-1.11.3/netsetup/netsetup 2017-01-09 20:09:22.000000000 +0100 @@ -356,7 +356,7 @@ fi dialog --visit-items --title "`eval_gettext "CONFIGURATION TYPE FOR \\\$HOSTNM.\\\$DOMAIN"`" \ ---default-item DHCP \ +--default-item NetworkManager \ --menu \ "`gettext "Now we need to know how your machine connects to the network. diff -Naur salixtools-1.11.2/usersetup/Makefile salixtools-1.11.3/usersetup/Makefile --- salixtools-1.11.2/usersetup/Makefile 2017-12-29 11:43:53.000000000 +0100 +++ salixtools-1.11.3/usersetup/Makefile 2016-10-31 20:46:54.000000000 +0100 @@ -23,6 +23,7 @@ install: install -d -m 755 $(DESTDIR)/usr/sbin install -m 755 usersetup $(DESTDIR)/usr/sbin/ + install -m 755 rootpasswd $(DESTDIR)/usr/sbin/ $(MAKE) install -C po $(MAKE) install -C man diff -Naur salixtools-1.11.2/usersetup/rootpasswd salixtools-1.11.3/usersetup/rootpasswd --- salixtools-1.11.2/usersetup/rootpasswd 1970-01-01 01:00:00.000000000 +0100 +++ salixtools-1.11.3/usersetup/rootpasswd 2016-10-31 20:39:10.000000000 +0100 @@ -0,0 +1,75 @@ +#!/bin/bash + +# This script manages the setting of a password. +# It is mostly intended during Slint installlation. +# Kind of a stripped down usersetup as found in salixtools, thus +# added to the salixtols package customized for Slint. +# This will ease the management of translations +# Didier Spaier + +# Translations only work with utf8 locales +if ! locale -k charmap|grep -q UTF-8 ; then + LANG=C +fi + +# Gettext internationalization +export TEXTDOMAIN="usersetup" +export TEXTDOMAINDIR="/usr/share/locale" +. gettext.sh + +# check for root privileges +if [ "$UID" != "0" ]; then + echo "`eval_gettext 'You need root privileges to run this'`" + exit 1 +fi + +# Password dialog +passbox(){ + DIALOG='dialog --stdout --insecure --fixed-font --no-cancel --smooth --passwordbox' + pw="$(${DIALOG} "${1}" 0 0)" + echo -n "$pw" +} + + +# Password checking +changepw(){ + +maxcount=5 +minlength=5 + +count=1 ; pw='_' +while [ "${pw}" != "${password}" ]; do + password="" ; pw='_' + if [ $count -gt $maxcount ]; then + echo -n "" + break + fi + + message="`eval_gettext 'Enter password for account'` ${1}... " + [ $count -ge 2 ] && message="`eval_gettext 'Passwords do not match, please try again...'`" + while [ "$(echo -n "${pw}" | wc --chars)" -lt ${minlength} ]; do + pw="$(passbox "${message}")" + message="`eval_gettext 'Password is too short (${minlength} chars minimum), please try another one...'` " + done + password="$pw" ; pw='_' + message="`eval_gettext 'Enter password again for account'` ${1}... " + pw="$(passbox "${message}")" + + count=$((count+1)) + +done + +echo -n $password +} + +# Change password + DIALOG="dialog" + user="root" + + [ "$user" ] && pass="$(changepw ${user})" + if [ ! "$pass" ] ; then + ${dialog} --msgbox "`eval_gettext 'Failed to set password for account'` \"${user}\" " 0 0 + else + # echo "${user}:${pass}" + [ "$user" ] && echo "${user}:${pass}" | chpasswd + fi diff -Naur salixtools-1.11.2/usersetup/usersetup salixtools-1.11.3/usersetup/usersetup --- salixtools-1.11.2/usersetup/usersetup 2017-12-29 11:43:53.000000000 +0100 +++ salixtools-1.11.3/usersetup/usersetup 2018-01-02 12:24:57.727889790 +0100 @@ -1,7 +1,7 @@ #!/bin/bash -# This script manages the creation, deletion and modification of users accounts -# and groups as well as their respective properties. +# This script manages the creation, deletion and modification of users +# accounts and groups as well as their respective properties. # Translations only work with utf8 locales if ! locale -k charmap|grep -q UTF-8 ; then @@ -29,7 +29,7 @@ shadowfile='/etc/shadow' for isgroupinsalix in audio video cdrom floppy lp plugdev scanner \ - power polkitd pulse netdev ; do + power polkitd netdev ; do grep -q "^${isgroupinsalix}:" $grpfile && useraddmembership="${isgroupinsalix},${useraddmembership}" done useraddmembership="$( echo ${useraddmembership} | sed -e 's/^\(.*\),$/\1/' )" @@ -45,7 +45,7 @@ --title "`eval_gettext 'Users accounts management'`" \ --menu \ "\n `eval_gettext 'Please choose an option...'` \n\n" \ -22 60 10 \ +0 0 9 \ "1" "`eval_gettext 'Create a new account'`" \ "2" "`eval_gettext 'Create a new account (advanced mode)'`" \ "3" "`eval_gettext 'Modify account properties'`" \ @@ -281,20 +281,44 @@ message="`eval_gettext 'An account name cannot contain uppercase characters, please correct it...'`" elif [ ! -z "$( echo $user | grep '\.' )" ]; then message="`eval_gettext 'An account name cannot contain punctuation marks, please correct it...'`" - fi + fi if [ "$message" = "ok" ]; then for membershipgroup in $(echo $useraddmembership | tr "," " ") ; do groupadd $membershipgroup 2>/dev/null done - # if no other user is present in the system, add the newly created - # user to the wheel group + # If no other user is present in the system, add the newly created + # user to the wheel group, but in Slint that do not use sudo by + # default. in Slint, add it do the braille group! we do not know + # if braille is used during installation, but tht won't hurt. + # Also, if we run during installation and speech is being used, + # start Orca for this user, and add it to the braille group. Didier. present_users=$( grep -v '^[^:]\+:x:[0-9]\{0,3\}:' /etc/passwd | wc -l ) if [ $present_users -eq 0 ]; then - GROUPS="${useraddmembership},wheel" + if [ ! -f /etc/slint-version ]; then + GROUPS="${useraddmembership},wheel" + else + GROUPS="${useraddmembership},braille" + fi + useradd -s $defaultshell -g $defaultgroup -m -k $skeleton -G $GROUPS "$user" 2>/dev/null + # If /tmp/speech exists, either we are in a Slint installer or + # Salix or Slackel brought speech to their installer :) + if [ -f /tmp/speech ] && [ -f /home/$user/.config/autostart/startorca.desktop ] ; then + (cd /home/$user/.config/autostart + sed s/Hidden=true/Hidden=false/ startorca.desktop > bof + mv bof startorca.desktop + chown $user: startorca.desktop + echo "$(> /home/$user/.profile + chown $user: /home/$user/.profile + ) + rm /tmp/speech + fi else GROUPS="${useraddmembership}" + useradd -s $defaultshell -g $defaultgroup -m -k $skeleton -G $GROUPS "$user" 2>/dev/null fi - useradd -s $defaultshell -g $defaultgroup -m -k $skeleton -G $GROUPS "$user" 2>/dev/null + # We want to set the default session for a new user, if possible. + # setsession is included in Slint64-14.2.1, in package slint-misc. + [ -x /usr/sbin/setsession] && . /usr/sbin/setsession fi fi current=""