Make self detect kdesu, kdesudo, gksu

Makefile

@@ -103,7 +103,9 @@ self:
 	install -m 0775 usr/lib/gambas3/gb.gui.so inex/usr/lib/gambas3/
 	install -m 0775 usr/lib/gambas3/gb.qt4.so inex/usr/lib/gambas3/
 	install -m 0775 install-self inex/install-self 
+	install -m 0775 install-self-inex inex/install-self-inex
 	chmod +x inex/install-self
+	chmod +x inex/install-self-inex
 	./makeself.sh --nowait --nox11 ./inex i-nex.run I-Nex ./install-self
 clean:
 	rm -f inex-edid

build-selfexecutable

@@ -2,25 +2,25 @@
 URL_DOWN="http://ppa.launchpad.net/nemh/gambas3/ubuntu/pool/main/g/gambas3/"
 wget -c $URL_DOWN
 ARCHITECTURE=$(dpkg --print-architecture)
-GB3_GB_IMAGE=$(cat ./index.html | egrep gambas3-gb-image_ | egrep $ARCHITECTURE.deb | sed -n '1p' | awk {'print $6'} | cut -d ">" -f 2 | cut -d '<' -f 1)
+GB3_GB_IMAGE=$(cat ./index.html | egrep gambas3-gb-image_ | egrep saucy | egrep $ARCHITECTURE.deb | sed -n '1p' | awk {'print $6'} | cut -d ">" -f 2 | cut -d '<' -f 1)
 
-GB3_GB_GTK=$(cat ./index.html | egrep gambas3-gb-gtk_ | egrep $ARCHITECTURE.deb | sed -n '1p' | awk {'print $6'} | cut -d ">" -f 2 | cut -d '<' -f 1)
+GB3_GB_GTK=$(cat ./index.html | egrep gambas3-gb-gtk_ | egrep saucy | egrep $ARCHITECTURE.deb | sed -n '1p' | awk {'print $6'} | cut -d ">" -f 2 | cut -d '<' -f 1)
 
-GB3_GB_FORM=$(cat ./index.html | egrep gambas3-gb-form_ | egrep all.deb | sed -n '1p' | awk {'print $6'} | cut -d ">" -f 2 | cut -d '<' -f 1)
+GB3_GB_FORM=$(cat ./index.html | egrep gambas3-gb-form_ | egrep saucy | egrep all.deb | sed -n '1p' | awk {'print $6'} | cut -d ">" -f 2 | cut -d '<' -f 1)
 
-GB3_GB_DESKTOP=$(cat ./index.html | egrep gambas3-gb-desktop_ | egrep $ARCHITECTURE.deb | sed -n '1p' | awk {'print $6'} | cut -d ">" -f 2 | cut -d '<' -f 1)
+GB3_GB_DESKTOP=$(cat ./index.html | egrep gambas3-gb-desktop_ | egrep saucy | egrep $ARCHITECTURE.deb | sed -n '1p' | awk {'print $6'} | cut -d ">" -f 2 | cut -d '<' -f 1)
 
-GB3_GB_FORM_DIALOG=$(cat ./index.html | egrep gambas3-gb-form-dialog_ | egrep all.deb | sed -n '1p' | awk {'print $6'} | cut -d ">" -f 2 | cut -d '<' -f 1)
+GB3_GB_FORM_DIALOG=$(cat ./index.html | egrep gambas3-gb-form-dialog_ | egrep saucy | egrep all.deb | sed -n '1p' | awk {'print $6'} | cut -d ">" -f 2 | cut -d '<' -f 1)
 
-GB3_GB_SETTINGS=$(cat ./index.html | egrep gambas3-gb-settings_ | egrep all.deb | sed -n '1p' | awk {'print $6'} | cut -d ">" -f 2 | cut -d '<' -f 1)
+GB3_GB_SETTINGS=$(cat ./index.html | egrep gambas3-gb-settings_ | egrep saucy | egrep all.deb | sed -n '1p' | awk {'print $6'} | cut -d ">" -f 2 | cut -d '<' -f 1)
 
-GB3_GB_FORM_STOCK=$(cat ./index.html | egrep gambas3-gb-form-stock_ | egrep all.deb | sed -n '1p' | awk {'print $6'} | cut -d ">" -f 2 | cut -d '<' -f 1)
+GB3_GB_FORM_STOCK=$(cat ./index.html | egrep gambas3-gb-form-stock_ | egrep saucy | egrep all.deb | sed -n '1p' | awk {'print $6'} | cut -d ">" -f 2 | cut -d '<' -f 1)
 
-GB3_RUNTIME=$(cat ./index.html | egrep gambas3-runtime_ | egrep $ARCHITECTURE.deb | sed -n '1p' | awk {'print $6'} | cut -d ">" -f 2 | cut -d '<' -f 1)
+GB3_RUNTIME=$(cat ./index.html | egrep gambas3-runtime_ | egrep saucy | egrep $ARCHITECTURE.deb | sed -n '1p' | awk {'print $6'} | cut -d ">" -f 2 | cut -d '<' -f 1)
 
-GB3_GB_GUI=$(cat ./index.html | egrep gambas3-gb-gui_ | egrep $ARCHITECTURE.deb | sed -n '1p' | awk {'print $6'} | cut -d ">" -f 2 | cut -d '<' -f 1)
+GB3_GB_GUI=$(cat ./index.html | egrep gambas3-gb-gui_ | egrep saucy | egrep $ARCHITECTURE.deb | sed -n '1p' | awk {'print $6'} | cut -d ">" -f 2 | cut -d '<' -f 1)
 
-GB3_GB_QT4=$(cat ./index.html | egrep gambas3-gb-qt4_ | egrep $ARCHITECTURE.deb | sed -n '1p' | awk {'print $6'} | cut -d ">" -f 2 | cut -d '<' -f 1)
+GB3_GB_QT4=$(cat ./index.html | egrep gambas3-gb-qt4_ | egrep saucy | egrep $ARCHITECTURE.deb | sed -n '1p' | awk {'print $6'} | cut -d ">" -f 2 | cut -d '<' -f 1)
 
 wget -c "$URL_DOWN$GB3_GB_IMAGE"
 wget -c "$URL_DOWN$GB3_GB_GTK"

install-self

@@ -1,59 +1,48 @@
 #!/bin/bash
-bindir="/usr/bin/"
-
-	mkdir -p $bindir
-	mkdir -p /usr/lib/gambas3/
-	mkdir -p /usr/share/pixmaps/
-	mkdir -p /usr/share/applications/
-	mkdir -p /etc/apport/crashdb.conf.d/
-	mkdir -p /usr/share/apport/package-hooks/
-	mkdir -p /usr/share/doc/i-nex/
-	mkdir -p /usr/share/i-nex/pastebinit/
-	mkdir -p /usr/share/i-nex/pastebinit/pastebin.d/
-	mkdir -p /usr/share/i-nex/pastebinit/po/
-	mkdir -p /usr/share/i-nex/pastebinit/utils/
-	install -m 0755 usr/bin/i-nex $bindir
-	install -m 0755 usr/bin/inex-edid $bindir
-	install -m 0755 usr/bin/i-nex.gambas $bindir
-	install -m 0755 usr/share/pixmaps/i-nex.0.4.x.png /usr/share/pixmaps/
-	install -m 0755 usr/share/applications/i-nex.desktop /usr/share/applications/
-	install -m 0755 usr/bin/check_kernel /usr/bin/
-	install -m 0755 usr/bin/i-nex-lspci /usr/bin/
-	install -m 0755 etc/apport/crashdb.conf.d/inex-crashdb.conf /etc/apport/crashdb.conf.d/
-	install -m 0755 usr/share/apport/package-hooks/i-nex.py /usr/share/apport/package-hooks/
-	install -m 0755 usr/share/doc/i-nex/changelog-0.4.6 /usr/share/doc/i-nex/
-	install -m 0755 usr/share/doc/i-nex/changelog-0.4.8 /usr/share/doc/i-nex/
-	install -m 0755 usr/share/doc/i-nex/changelog-0.4.8.1 /usr/share/doc/i-nex/
-	install -m 0755 usr/share/doc/i-nex/changelog-0.5.0 /usr/share/doc/i-nex/
-	install -m 0755 usr/share/doc/i-nex/changelog-0.5.1 /usr/share/doc/i-nex/
-	install -m 0755 usr/share/doc/i-nex/changelog-0.5.2 /usr/share/doc/i-nex/
-	install -m 0755 usr/share/doc/i-nex/changelog-0.5.4 /usr/share/doc/i-nex/
-	install -m 0755 usr/share/doc/i-nex/LICENSE /usr/share/doc/i-nex/
-	install -m 0755 usr/share/i-nex/pastebinit/COPYING /usr/share/i-nex/pastebinit/
-	install -m 0755 usr/share/i-nex/pastebinit/pastebin.d/* /usr/share/i-nex/pastebinit/pastebin.d/
-	install -m 0755 usr/share/i-nex/pastebinit/pastebinit /usr/share/i-nex/pastebinit/
-	install -m 0755 usr/share/i-nex/pastebinit/pastebinit.xml /usr/share/i-nex/pastebinit/
-	install -m 0755 usr/share/i-nex/pastebinit/po/* /usr/share/i-nex/pastebinit/po/
-	install -m 0755 usr/share/i-nex/pastebinit/README /usr/share/i-nex/pastebinit/
-	install -m 0755 usr/share/i-nex/pastebinit/release.conf /usr/share/i-nex/pastebinit/
-	install -m 0755 usr/share/i-nex/pastebinit/test.sh /usr/share/i-nex/pastebinit/
-	install -m 0755 usr/share/i-nex/pastebinit/utils/* /usr/share/i-nex/pastebinit/utils/
-	install -m 0775 usr/bin/gbx3 /usr/bin/gbx3
-	install -m 0775 usr/bin/gbr3 /usr/bin/gbr3
-	install -m 0775 usr/lib/gambas3/gb.debug.so /usr/lib/gambas3/
-	install -m 0775 usr/lib/gambas3/gb.desktop.gambas /usr/lib/gambas3/
-	install -m 0775 usr/lib/gambas3/gb.desktop.gnome.so /usr/lib/gambas3/
-	install -m 0775 usr/lib/gambas3/gb.desktop.so /usr/lib/gambas3/
-	install -m 0775 usr/lib/gambas3/gb.draw.so /usr/lib/gambas3/
-	install -m 0775 usr/lib/gambas3/gb.eval.so /usr/lib/gambas3/
-	install -m 0775 usr/lib/gambas3/gb.form.dialog.gambas /usr/lib/gambas3/
-	install -m 0775 usr/lib/gambas3/gb.form.gambas /usr/lib/gambas3/
-	install -m 0775 usr/lib/gambas3/gb.form.stock.gambas /usr/lib/gambas3/
-	install -m 0775 usr/lib/gambas3/gb.geom.so /usr/lib/gambas3/
-	install -m 0775 usr/lib/gambas3/gb.gtk.so /usr/lib/gambas3/
-	install -m 0775 usr/lib/gambas3/gb.gui.base.gambas /usr/lib/gambas3/
-	install -m 0775 usr/lib/gambas3/gb.image.so /usr/lib/gambas3/
-	install -m 0775 usr/lib/gambas3/gb.settings.gambas /usr/lib/gambas3/
-	install -m 0775 usr/lib/gambas3/gb.so /usr/lib/gambas3/
-	install -m 0775 usr/lib/gambas3/gb.gui.so /usr/lib/gambas3/
-	install -m 0775 usr/lib/gambas3/gb.qt4.so /usr/lib/gambas3/
+
+if [ x"$KDE_FULL_SESSION" = x"true" ]; then
+{ #KDE
+    if [ -f /usr/bin/kdesudo ]; then ROOT="/usr/bin/kdesudo"; else
+      if [ -f /usr/bin/kdesu ]; then ROOT="/usr/bin/kdesu"; else
+        if [ -f /usr/bin/gksu ]; then ROOT="/usr/bin/gksu"; else
+          ROOT='sudo'
+        fi
+      fi
+    fi
+} #KDE (End)
+else if [ x"$GNOME_DESKTOP_SESSION_ID" != x"" ]; then
+{ #Gnome
+    if [ -f /usr/bin/gksu ]; then ROOT="/usr/bin/gksu"; else
+      if [ -f /usr/bin/kdesudo ]; then ROOT="/usr/bin/kdesudo"; else
+        if [ -f /usr/bin/kdesu ]; then ROOT="/usr/bin/kdesu"; else
+          ROOT='sudo'
+        fi
+      fi
+    fi
+} #Gnome (End)
+else if [ x"$DISPLAY" != x"" ]; then
+{ #Other X
+    if [ -f /usr/bin/gksu ]; then ROOT="/usr/bin/gksu"; else
+      if [ -f /usr/bin/kdesudo ]; then ROOT="/usr/bin/kdesudo"; else
+        if [ -f /usr/bin/kdesu ]; then ROOT="/usr/bin/kdesu"; else
+          ROOT='sudo'
+        fi
+      fi
+    fi
+} #Other X (End)
+else
+{ #No known session
+    if [ -f /usr/bin/gksu ]; then ROOT="/usr/bin/gksu"; else
+      if [ -f /usr/bin/kdesudo ]; then ROOT="/usr/bin/kdesudo"; else
+        if [ -f /usr/bin/kdesu ]; then ROOT="/usr/bin/kdesu"; else
+          ROOT='sudo'
+        fi
+      fi
+    fi
+} #No known session (End)
+fi
+fi
+fi
+$ROOT ./install-self-inex
+/usr/bin/i-nex
+exit 0

install-self-inex

@@ -0,0 +1,58 @@
+#!/bin/bash
+bindir="/usr/bin/"
+	mkdir -p $bindir
+	mkdir -p /usr/lib/gambas3/
+	mkdir -p /usr/share/pixmaps/
+	mkdir -p /usr/share/applications/
+	mkdir -p /etc/apport/crashdb.conf.d/
+	mkdir -p /usr/share/apport/package-hooks/
+	mkdir -p /usr/share/doc/i-nex/
+	mkdir -p /usr/share/i-nex/pastebinit/
+	mkdir -p /usr/share/i-nex/pastebinit/pastebin.d/
+	mkdir -p /usr/share/i-nex/pastebinit/po/
+	mkdir -p /usr/share/i-nex/pastebinit/utils/
+	install -m 0755 usr/bin/i-nex $bindir
+	install -m 0755 usr/bin/inex-edid $bindir
+	install -m 0755 usr/bin/i-nex.gambas $bindir
+	install -m 0755 usr/share/pixmaps/i-nex.0.4.x.png /usr/share/pixmaps/
+	install -m 0755 usr/share/applications/i-nex.desktop /usr/share/applications/
+	install -m 0755 usr/bin/check_kernel /usr/bin/
+	install -m 0755 usr/bin/i-nex-lspci /usr/bin/
+	install -m 0755 etc/apport/crashdb.conf.d/inex-crashdb.conf /etc/apport/crashdb.conf.d/
+	install -m 0755 usr/share/apport/package-hooks/i-nex.py /usr/share/apport/package-hooks/
+	install -m 0755 usr/share/doc/i-nex/changelog-0.4.6 /usr/share/doc/i-nex/
+	install -m 0755 usr/share/doc/i-nex/changelog-0.4.8 /usr/share/doc/i-nex/
+	install -m 0755 usr/share/doc/i-nex/changelog-0.4.8.1 /usr/share/doc/i-nex/
+	install -m 0755 usr/share/doc/i-nex/changelog-0.5.0 /usr/share/doc/i-nex/
+	install -m 0755 usr/share/doc/i-nex/changelog-0.5.1 /usr/share/doc/i-nex/
+	install -m 0755 usr/share/doc/i-nex/changelog-0.5.2 /usr/share/doc/i-nex/
+	install -m 0755 usr/share/doc/i-nex/changelog-0.5.4 /usr/share/doc/i-nex/
+	install -m 0755 usr/share/doc/i-nex/LICENSE /usr/share/doc/i-nex/
+	install -m 0755 usr/share/i-nex/pastebinit/COPYING /usr/share/i-nex/pastebinit/
+	install -m 0755 usr/share/i-nex/pastebinit/pastebin.d/* /usr/share/i-nex/pastebinit/pastebin.d/
+	install -m 0755 usr/share/i-nex/pastebinit/pastebinit /usr/share/i-nex/pastebinit/
+	install -m 0755 usr/share/i-nex/pastebinit/pastebinit.xml /usr/share/i-nex/pastebinit/
+	install -m 0755 usr/share/i-nex/pastebinit/po/* /usr/share/i-nex/pastebinit/po/
+	install -m 0755 usr/share/i-nex/pastebinit/README /usr/share/i-nex/pastebinit/
+	install -m 0755 usr/share/i-nex/pastebinit/release.conf /usr/share/i-nex/pastebinit/
+	install -m 0755 usr/share/i-nex/pastebinit/test.sh /usr/share/i-nex/pastebinit/
+	install -m 0755 usr/share/i-nex/pastebinit/utils/* /usr/share/i-nex/pastebinit/utils/
+	install -m 0775 usr/bin/gbx3 /usr/bin/gbx3
+	install -m 0775 usr/bin/gbr3 /usr/bin/gbr3
+	install -m 0775 usr/lib/gambas3/gb.debug.so /usr/lib/gambas3/
+	install -m 0775 usr/lib/gambas3/gb.desktop.gambas /usr/lib/gambas3/
+	install -m 0775 usr/lib/gambas3/gb.desktop.gnome.so /usr/lib/gambas3/
+	install -m 0775 usr/lib/gambas3/gb.desktop.so /usr/lib/gambas3/
+	install -m 0775 usr/lib/gambas3/gb.draw.so /usr/lib/gambas3/
+	install -m 0775 usr/lib/gambas3/gb.eval.so /usr/lib/gambas3/
+	install -m 0775 usr/lib/gambas3/gb.form.dialog.gambas /usr/lib/gambas3/
+	install -m 0775 usr/lib/gambas3/gb.form.gambas /usr/lib/gambas3/
+	install -m 0775 usr/lib/gambas3/gb.form.stock.gambas /usr/lib/gambas3/
+	install -m 0775 usr/lib/gambas3/gb.geom.so /usr/lib/gambas3/
+	install -m 0775 usr/lib/gambas3/gb.gtk.so /usr/lib/gambas3/
+	install -m 0775 usr/lib/gambas3/gb.gui.base.gambas /usr/lib/gambas3/
+	install -m 0775 usr/lib/gambas3/gb.image.so /usr/lib/gambas3/
+	install -m 0775 usr/lib/gambas3/gb.settings.gambas /usr/lib/gambas3/
+	install -m 0775 usr/lib/gambas3/gb.so /usr/lib/gambas3/
+	install -m 0775 usr/lib/gambas3/gb.gui.so /usr/lib/gambas3/
+	install -m 0775 usr/lib/gambas3/gb.qt4.so /usr/lib/gambas3/ 

src/i-nex/.settings

@@ -23,6 +23,7 @@ SearchString=True
 [OpenFile]
 File[1]=".src/Finfosys.form"
 File[2]=".src/Global.class:92.57"
+Active=3
 File[3]=".src/About.form"
 File[4]=".src/About.class:41.49"
 File[5]=".src/battery.module:70.77"
@@ -32,7 +33,6 @@ File[8]=".src/ScreenShot.class:12.65"
 File[9]=".src/ScreenShotM.module:7.0"
 File[10]=".src/USB_Drives.module:13.0"
 File[11]=".src/Asound_Drives.module:33.27"
-Active=12
 File[12]=".src/Reportm.module:4.15"
 File[13]=".src/FReport_Gen.form"
 File[14]=".src/FReport_Gen.class:28.37"
@@ -47,7 +47,7 @@ File[22]=".src/net.module:104.1"
 File[23]="Data/report-ng.sh:27.44"
 File[24]=".src/Distribution_Detect.module:13.20"
 File[25]=".src/FFlags.module:71.6"
-File[26]=".src/Finfosys.class:579.67"
+File[26]=".src/Finfosys.class:227.25"
 File[27]=".src/FDF.form"
 File[28]=".src/FDF.class:28.69"
 File[29]=".src/FNET_R_T.form"

src/i-nex/.src/Finfosys.class

@@ -192,8 +192,8 @@ Public Sub System()
   Distribution_Detect._init
   TextBox60.Text = File.Load("" & User.Home & "/.i-nex/DistributionVendor.conf")
   TextBox61.Text = File.Load("" & User.Home & "/.i-nex/DistributionRelease.conf")
-  Replace(TextBox60.Text, "\n", "")
-  Replace(TextBox61.Text, "\n", "")
+  Replace(Replace(TextBox60.Text, " ", ""), "\n", "")
+  Replace(Replace(TextBox61.Text, " ", ""), "\n", "")
 End
 
 Public Sub grafika()
@@ -223,9 +223,9 @@ Public Sub grafika()
     Message.Warning("Not found xrandr")
   Endif
   Label64.Text = "Total Memory: " & Replace(memory_prefetchable, "\n", "")
-  Label105.Text = "OpenGl Vendor: " & Replace(opengl_vendor_string, "\n", "")
-  Label106.Text = "OpenGl Renderer: " & Replace(opengl_renderer_string, "\n", "")
-  Label107.Text = "OpenGl Version: " & Replace(opengl_version_string, "\n", "")
+  Label105.Text = "OpenGL Vendor: " & Replace(opengl_vendor_string, "\n", "")
+  Label106.Text = "OpenGL Renderer: " & Replace(opengl_renderer_string, "\n", "")
+  Label107.Text = "OpenGL Version: " & Replace(opengl_version_string, "\n", "")
   Label108.Text = "Present resolution: " & Replace(rozdzielczosc, "\n", "")
   TextBox1.Text = RTrim(Replace(gpu, "\n", ""))
   Label109.Text = Replace(available_resolutions, "\n", "")