diff --git a/VERSAO b/VERSAO
index 3eefcb9dd5b38e2c1dc061052455dd97bcd51e6c..af0b7ddbffd5d5a877581ba8ba10deed158da14d 100644
--- a/VERSAO
+++ b/VERSAO
@@ -1 +1 @@
-1.0.0
+1.0.6
diff --git a/pacote/etc/le-multiterminal/userful-multiplier/installer.sh b/pacote/etc/le-multiterminal/userful-multiplier/installer.sh
index f9d9d319f60929c588148e581df91216d1229767..093d8892ff62c436373b28bd7a8d111e01c3a381 100755
--- a/pacote/etc/le-multiterminal/userful-multiplier/installer.sh
+++ b/pacote/etc/le-multiterminal/userful-multiplier/installer.sh
@@ -139,7 +139,7 @@ function exit_installer()
##
function install_umx()
{
- cd ./packages > /dev/null
+ pushd ./packages > /dev/null
bash ./INSTALL
}
@@ -183,7 +183,7 @@ if lspci | grep -iq nvidia ; then
echo "will not work on every video output. Please see the user guide"
echo "for more information."
echo -n "Do you still want to install [y/N]? "
- #read ANS
+ #read ANS
ANS=y
if [ "$ANS" != y ] && [ "$ANS" != Y ] ; then
exit_installer
@@ -204,7 +204,7 @@ if [ -e ./new-distro.conf ]; then
echo
echo "Testing Userful Multiplier on a new Linux Distro..."
#read -s -p "Please enter any key to continue.."
-
+
if [ -d /etc/userful ]; then
cp -f ./new-distro.conf /etc/userful
else
@@ -246,7 +246,7 @@ elif [ "$OSTYPE" == "ubuntu" ]; then
install_umx
elif [ "$PKG_TYPE" == "ubuntu" ]; then
# run gdebi
- cd ./packages > /dev/null
+ pushd ./packages > /dev/null
gdebi *.deb
else
echo "You have wrong version of Userful Multiplier."
diff --git a/pacote/etc/le-multiterminal/userful-multiplier/packages/DM-VERSION b/pacote/etc/le-multiterminal/userful-multiplier/packages/DM-VERSION
index bbb16174b4c82eebbfd93dabe91701e99d7ea2c7..0ace7326f1adb9856e299ec30efff80b60349dbc 100644
--- a/pacote/etc/le-multiterminal/userful-multiplier/packages/DM-VERSION
+++ b/pacote/etc/le-multiterminal/userful-multiplier/packages/DM-VERSION
@@ -1 +1 @@
-3918-20110215110935
+3918-20110302121007
diff --git a/pacote/etc/le-multiterminal/userful-multiplier/packages/INSTALL b/pacote/etc/le-multiterminal/userful-multiplier/packages/INSTALL
index c87f746ac8346cdf90062d919e64af6021032c1b..eee6b215c40b5be2229af1991224d00847d4237d 100644
--- a/pacote/etc/le-multiterminal/userful-multiplier/packages/INSTALL
+++ b/pacote/etc/le-multiterminal/userful-multiplier/packages/INSTALL
@@ -440,6 +440,9 @@ function pre_uninstall()
function install_pkg()
{
+ echo "All packages should be already installed."
+ return 0
+
local pkg_list=$1
local pkg_cnt=$2
@@ -626,12 +629,12 @@ if [ "$ARCH_MISMATCH" == "$TRUE" ]; then
$DIALOG --backtitle "$BACKTITLE" --title "Installing Userful Multiplier" --msgbox "\nYou are installing $PKG_ARCH version of Desktop Multiplier on $ARCH system.\n\nPlease download the correct version and install again." 12 100
else
echo "------------------------------------------------------------------------------------"
- echo "ERROR: You are installing $PKG_ARCH version of Desktop Multiplier on $ARCH system"
- echo "ERROR: Please download the correct version and insatll again."
+ echo "WARNING: You are installing $PKG_ARCH version of Desktop Multiplier on $ARCH system"
+ echo "WARNING: Please download the correct version and insatll again."
echo "------------------------------------------------------------------------------------"
echo ""
fi
- exit 1
+ #exit 1
fi
###################
@@ -646,7 +649,7 @@ else
echo -e "Userful Multiplier is a software add-on that allows your Linux\nopterating system to support up to 10 independent users.\n\nPlease find more information about Userful Multiplier at:\n\nhttp://support.userful.com/wiki/index.php/Readme/Desktop_Multiplier"
echo
- echo -n "Press any key to continue.."
+ #echo -n "Press any key to continue.."
#read -s -n 1 TMP
fi
@@ -655,7 +658,7 @@ fi
##
CURRDIR=${0%`basename $0`}
if [ -n "$CURRDIR" ]; then
- cd $CURRDIR >> /dev/null
+ pushd $CURRDIR >> /dev/null
fi
####################
@@ -664,12 +667,13 @@ fi
clear
#more -d Userful-EULA.txt
cat Userful-EULA.txt
+
INPUT=""
while [ "$INPUT" != "y" -a "$INPUT" != "n" ];
do
echo
echo "Do you accept the terms of this license? [y/n]"
- #read -n 1 INPUT
+ #read -n 1 INPUT
INPUT=y
done
@@ -819,14 +823,14 @@ if [[ "$BASE_SYSTEM" == "RPM" ]]; then
$RPM -Uvh `ls umx-utils-* | tail -n 1` > /dev/null 2>&1
elif [[ "$BASE_SYSTEM" == "DEB" ]]; then
echo "umx-utils should be already installed."
- # $DPKG -i `ls umx-utils-*.deb | tail -n 1` # > /dev/null 2>&1
+ #$DPKG -i `ls umx-utils-*.deb | tail -n 1` > /dev/null 2>&1
else
echo "Only support RPM or DEB based system."
exit 1
fi
if [ "$?" -ne 0 ]; then
echo "Failed to install umx-utils package."
- exit 1
+ exit 1
fi
# find User's agreement
E1=`cat /opt/userful/bin/installvalue 2>> /dev/null`
@@ -883,8 +887,8 @@ if [[ -e /etc/X11/userful.Mxorg.conf ]]; then
while [ "$INPUT" != "y" -a "$INPUT" != "n" ];
do
echo -n "Do you want to delete the old configration file? [y/n]"
- INPUT=y
#read -n 1 INPUT
+ INPUT=y
done
if [ "$INPUT" = "y" ]; then
@@ -918,8 +922,8 @@ else
while [ "$INPUT" != "y" -a "$INPUT" != "n" ];
do
#echo "Do you want to reboot system now? [y/n]"
- echo "Please, reboot your system!"
#read -n 1 INPUT
+ echo "You need to reboot the system for the changes to take effect."
INPUT="n"
done
diff --git a/pacote/etc/le-multiterminal/userful-multiplier/packages/libusb-v1-1.0.6-2.i386.deb b/pacote/etc/le-multiterminal/userful-multiplier/packages/libusb-v1-1.0.6-2.i386.deb
index aebd711e2b44bbbb8243e94185272bbf08d8b972..b97ffdc1c0565d8711b9081a2cd36749cb0f9f4c 100644
Binary files a/pacote/etc/le-multiterminal/userful-multiplier/packages/libusb-v1-1.0.6-2.i386.deb and b/pacote/etc/le-multiterminal/userful-multiplier/packages/libusb-v1-1.0.6-2.i386.deb differ
diff --git a/pacote/etc/le-multiterminal/userful-multiplier/packages/umx-mesa-7.2-3.i386.deb b/pacote/etc/le-multiterminal/userful-multiplier/packages/umx-mesa-7.2-3.i386.deb
index 2138839e4865fdd0e9a32ebc449009775a4459d4..5caf6e974e28a9c5665cd366d144ae38917f5ace 100644
Binary files a/pacote/etc/le-multiterminal/userful-multiplier/packages/umx-mesa-7.2-3.i386.deb and b/pacote/etc/le-multiterminal/userful-multiplier/packages/umx-mesa-7.2-3.i386.deb differ
diff --git a/pacote/etc/le-multiterminal/userful-multiplier/packages/umx-multimedia-146-20110215111040.i386.deb b/pacote/etc/le-multiterminal/userful-multiplier/packages/umx-multimedia-146-20110215111040.i386.deb
deleted file mode 100644
index 1f5b4d7c3791c14aed5c6165f53818d721a8df61..0000000000000000000000000000000000000000
Binary files a/pacote/etc/le-multiterminal/userful-multiplier/packages/umx-multimedia-146-20110215111040.i386.deb and /dev/null differ
diff --git a/pacote/etc/le-multiterminal/userful-multiplier/packages/umx-multimedia-146-20110302121135.i386.deb b/pacote/etc/le-multiterminal/userful-multiplier/packages/umx-multimedia-146-20110302121135.i386.deb
new file mode 100644
index 0000000000000000000000000000000000000000..5579888224e87d0516ed70dc7c8331442d266acd
Binary files /dev/null and b/pacote/etc/le-multiterminal/userful-multiplier/packages/umx-multimedia-146-20110302121135.i386.deb differ
diff --git a/pacote/etc/le-multiterminal/userful-multiplier/packages/umx-server-153-201102081325.i386.deb b/pacote/etc/le-multiterminal/userful-multiplier/packages/umx-server-153-201102081325.i386.deb
index ac6ad8e2cd483608451ea80fef395658f228af3e..f3c665afb9082cdf09d06c6247cd1de8c555a5dd 100644
Binary files a/pacote/etc/le-multiterminal/userful-multiplier/packages/umx-server-153-201102081325.i386.deb and b/pacote/etc/le-multiterminal/userful-multiplier/packages/umx-server-153-201102081325.i386.deb differ
diff --git a/pacote/etc/le-multiterminal/userful-multiplier/packages/umx-storage-139-20110215111041.i386.deb b/pacote/etc/le-multiterminal/userful-multiplier/packages/umx-storage-139-20110215111041.i386.deb
deleted file mode 100644
index 70d911e24e86992f172e0a54ed21121572f9c4a0..0000000000000000000000000000000000000000
Binary files a/pacote/etc/le-multiterminal/userful-multiplier/packages/umx-storage-139-20110215111041.i386.deb and /dev/null differ
diff --git a/pacote/etc/le-multiterminal/userful-multiplier/packages/umx-storage-139-20110302121137.i386.deb b/pacote/etc/le-multiterminal/userful-multiplier/packages/umx-storage-139-20110302121137.i386.deb
new file mode 100644
index 0000000000000000000000000000000000000000..cc6b5ecafc306050150df4dfca0833aa5c832b65
Binary files /dev/null and b/pacote/etc/le-multiterminal/userful-multiplier/packages/umx-storage-139-20110302121137.i386.deb differ
diff --git a/pacote/etc/le-multiterminal/userful-multiplier/packages/umx-tusb-1.0-3.i386.deb b/pacote/etc/le-multiterminal/userful-multiplier/packages/umx-tusb-1.0-3.i386.deb
index e445a8f289fd54f99d701e848b080bd7890ea41b..7b016f3db3fc34ec02b8c07a9ed4a6cdf3787af4 100644
Binary files a/pacote/etc/le-multiterminal/userful-multiplier/packages/umx-tusb-1.0-3.i386.deb and b/pacote/etc/le-multiterminal/userful-multiplier/packages/umx-tusb-1.0-3.i386.deb differ
diff --git a/pacote/etc/le-multiterminal/userful-multiplier/packages/umx-utils-3918-20110215110935.i386.deb b/pacote/etc/le-multiterminal/userful-multiplier/packages/umx-utils-3918-20110215110935.i386.deb
deleted file mode 100644
index f70846a3eaf111433005336180360c172312228f..0000000000000000000000000000000000000000
Binary files a/pacote/etc/le-multiterminal/userful-multiplier/packages/umx-utils-3918-20110215110935.i386.deb and /dev/null differ
diff --git a/pacote/etc/le-multiterminal/userful-multiplier/packages/umx-utils-3918-20110302121007.i386.deb b/pacote/etc/le-multiterminal/userful-multiplier/packages/umx-utils-3918-20110302121007.i386.deb
new file mode 100644
index 0000000000000000000000000000000000000000..3235390cfba4ede9e57a6fbc777986945c762805
Binary files /dev/null and b/pacote/etc/le-multiterminal/userful-multiplier/packages/umx-utils-3918-20110302121007.i386.deb differ