Merge pull request MrMEEE#564 from Ximi1970/master

Fix whiptail in bumblebee-configuration, remove bumblebee-check.opensuse
theresa617 · Aug 4, 2011 · d7d30a6 · d7d30a6
2 parents 55fdc3f + 90f912d
commit d7d30a6
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 190 deletions.
diff --git a/install-files/bumblebee-check.opensuse b/install-files/bumblebee-check.opensuse
diff --git a/install-files/bumblebee-configuration b/install-files/bumblebee-configuration
@@ -68,8 +68,8 @@ NVIDIABUSIDCUT=`grep BusID /etc/X11/xorg.conf.nvidia | sed -e "s/[ \t]*BusID[ \t
 
 if [ -f "$DEFAULT_FILE" ] ; then
 	whiptail --yesno \
-		"Bumblebee Configuration.\n\n"\
-		"Do you really want to reconfigure bumblebee?" $LINES $COLUMNS || exit 0
+"Bumblebee Configuration.\n\n"\
+"Do you really want to reconfigure bumblebee?" $LINES $COLUMNS || exit 0
 else
 	# -f to prevent error messages should the file not exist
 	rm -f "$DEFAULT_FILE"

diff --git a/install-files/bumblebee-uninstall b/install-files/bumblebee-uninstall
@@ -132,19 +132,6 @@ elif [ $DISTRO = OPENSUSE ]; then
       /usr/local/bin/bumblebee-enablecard
     fi
 
-#    FOUND=`rpm -qa|grep x11-video-nvidia`
-#    if [ "$FOUND" != "" ] || ( [ -d /usr/X11R6/lib-nvidia ] && [ ! -d /usr/X11R6/nvidia ] ) ; then
-#	if [ -f /usr/local/bin/bumblebee-check ] ; then
-	  #
-	  #	Cleanup 3D hack for the repository
-	  #
-	  #	Do not cleanup. It will kill the Intel 3D and put the Intel X server image upside down
-	  # if the nVidia driver is not removed.
-	  #
-#	  /usr/local/bin/bumblebee-check -restore
-#	fi
-#    fi
-
     if [ -f /usr/bin/nvidia-uninstall ] ; then
 
 	echo "Uninstalling nVidia package"