Skip to content

Commit

Permalink
Add to System tab more info.
Browse files Browse the repository at this point in the history
GNU Make Version
PPP
Dynamic linker (ldd)
Net-tools
Wireless-tools
  • Loading branch information
eloaders committed Dec 28, 2013
1 parent 1ce54f1 commit 419c327
Show file tree
Hide file tree
Showing 3 changed files with 75 additions and 28 deletions.
9 changes: 6 additions & 3 deletions src/i-nex/.src/Finfosys.class
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ Public Sub bios()
End

Public Sub System()
Dim hostname, arch, gcc, timezone, xorg_version, glx_version, gnumake As String
Dim hostname, arch, gcc, timezone, xorg_version, glx_version As String
Shell "cat /etc/timezone || grep ^TIMEZONE= /etc/sysconfig/clock | cut -d '=' -f 2" Wait To timezone
If timezone = Null Or "" Then
Shell "timedatectl status | grep Timezone: |awk '{print $2}'" Wait To timezone
Expand All @@ -214,10 +214,8 @@ Public Sub System()
Shell "gcc -dumpversion" Wait To gcc
Shell "cat /var/log/Xorg.0.log | grep 'X.Org X Server' | awk {'print $4'}" Wait To xorg_version
Shell "glxinfo | grep 'GLX version:' | sed -n '1p' | cut -d ':' -f 2" Wait To glx_version
Shell "make --version | sed -n '1p'" Wait To gnumake
'Shell "echo $SHELL" Wait To TextBox67.Text
Label135.Text = "System SHELL: " & System.Shell
Label136.Text = "GNU Make Version: " & Replace(gnumake, "\n", "")
Label137.Text = "GCC Version: " & Replace(gcc, "\n", "")
Label138.Text = "Hostname: " & Replace(hostname, "\n", "")
Label139.Text = "Arch: " & Replace(arch, "\n", "")
Expand All @@ -236,6 +234,11 @@ Public Sub System()
Label63.Text = "GTK+ 3 Theme: " & Replace(Replace(Replace(File.Load("" & User.Home & "/.i-nex/gtk3Theme.conf"), "\n", ""), " ", ""), "\n", "")
Label147.Text = "GTK Font: " & Replace(Replace(Replace(File.Load("" & User.Home & "/.i-nex/gtkFont.conf"), "\n", ""), " ", ""), "\n", "")
Label148.Text = "GTK Icons: " & Replace(Replace(Replace(File.Load("" & User.Home & "/.i-nex/gtkIcons.conf"), "\n", ""), " ", ""), "\n", "")
Label149.Text = "GNU Make Version: " & Replace(Replace(Replace(File.Load("" & User.Home & "/.i-nex/GNUMAKE.conf"), "\n", ""), " ", ""), "\n", "")
Label150.Text = "PPP: " & Replace(Replace(Replace(File.Load("" & User.Home & "/.i-nex/PPP.conf"), "\n", ""), " ", ""), "\n", "")
Label151.Text = "Dynamic linker (ldd): " & Replace(Replace(Replace(File.Load("" & User.Home & "/.i-nex/DYNAMIC_LINKER.conf"), "\n", ""), " ", ""), "\n", "")
Label152.Text = "Net-tools: " & Replace(Replace(Replace(File.Load("" & User.Home & "/.i-nex/NETTOOLS.conf"), "\n", ""), " ", ""), "\n", "")
Label153.Text = "Wireless-tools: " & Replace(Replace(Replace(File.Load("" & User.Home & "/.i-nex/WIRELESS_TOOLS.conf"), "\n", ""), " ", ""), "\n", "")
' DE.conf
' WM.conf
' Win_theme.conf
Expand Down
77 changes: 53 additions & 24 deletions src/i-nex/.src/Finfosys.form
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,7 @@
Move(336,0,14,126)
}
{ Separator10 Separator
Move(0,49,98,14)
Move(0,49,105,14)
}
{ Separator11 Separator
Move(175,364,14,98)
Expand Down Expand Up @@ -1080,15 +1080,15 @@
ReadOnly = True
}
{ TextLabel21 TextLabel
Move(84,385,378,28)
Move(84,399,378,28)
#Translate = False
Font = Font["Bold,8"]
Padding = 3
Alignment = Align.Left
Border = Border.Raised
}
{ Button7 Button
Move(7,385,72,24)
Move(7,399,72,24)
#Translate = False
Font = Font["Bold,8"]
ToolTip = "Show number packages installed on your system.\nShow deb, rpm or pkg"
Expand All @@ -1111,73 +1111,67 @@
Text = "Label135"
Border = Border.Raised
}
{ Label136 Label
Move(7,301,231,21)
#Translate = False
Font = Font["Bold,8"]
Padding = 3
Text = "Label136"
Border = Border.Raised
}
{ Label137 Label
Move(238,301,224,21)
Move(238,294,224,21)
#Translate = False
Font = Font["Bold,8"]
Padding = 3
Text = "Label137"
Border = Border.Raised
}
{ Label138 Label
Move(7,238,455,21)
Move(7,210,455,21)
#Translate = False
Font = Font["Bold,8"]
Padding = 3
Text = "Label138"
Alignment = Align.Center
Border = Border.Raised
}
{ Label139 Label
Move(238,322,224,21)
Move(238,252,224,21)
#Translate = False
Font = Font["Bold,8"]
Padding = 3
Text = "Label139"
Border = Border.Raised
}
{ Label140 Label
Move(7,259,455,21)
Move(7,252,231,21)
#Translate = False
Font = Font["Bold,8"]
Padding = 3
Text = "Label140"
Border = Border.Raised
}
{ Label141 Label
Move(7,322,231,21)
Move(7,294,231,21)
#Translate = False
Font = Font["Bold,8"]
Padding = 3
Text = "Label141"
Border = Border.Raised
}
{ Label142 Label
Move(7,280,231,21)
Move(7,273,231,21)
#Translate = False
Font = Font["Bold,8"]
Padding = 3
Text = "Label142"
Border = Border.Raised
}
{ Label143 Label
Move(7,343,231,21)
Move(7,231,455,21)
#Translate = False
Visible = False
Font = Font["Bold,8"]
Padding = 3
Text = "Label143"
Alignment = Align.Center
Border = Border.Raised
}
{ Label144 Label
Move(238,280,224,21)
Move(238,273,224,21)
#Translate = False
Font = Font["Bold,8"]
Padding = 3
Expand All @@ -1189,7 +1183,7 @@
Stretch = True
}
{ Label145 Label
Move(238,343,224,21)
Move(238,315,224,21)
#Translate = False
Font = Font["Bold,8"]
Padding = 3
Expand Down Expand Up @@ -1246,22 +1240,57 @@
Border = Border.Raised
}
{ Separator1 Separator
Move(0,224,469,14)
Move(0,196,469,14)
}
{ Separator6 Separator
Move(0,364,469,21)
Move(0,385,469,14)
}
{ Separator7 Separator
Move(301,0,14,196)
Move(301,0,14,203)
}
{ Separator8 Separator
Move(0,413,469,21)
Move(0,420,469,14)
}
{ Button15 Button
Move(441,434,21,21)
ToolTip = ("Copy")
Picture = Picture["icon:/16/copy"]
}
{ Label149 Label
Move(238,336,224,21)
Font = Font["Bold,8"]
Padding = 3
Text = ("Label149")
Border = Border.Raised
}
{ Label150 Label
Move(7,336,231,21)
Font = Font["Bold,8"]
Padding = 3
Text = ("Label150")
Border = Border.Raised
}
{ Label151 Label
Move(238,357,224,21)
Font = Font["Bold,8"]
Padding = 3
Text = ("Label151")
Border = Border.Raised
}
{ Label152 Label
Move(7,357,231,21)
Font = Font["Bold,8"]
Padding = 3
Text = ("Label152")
Border = Border.Raised
}
{ Label153 Label
Move(7,315,231,21)
Font = Font["Bold,8"]
Padding = 3
Text = ("Label153")
Border = Border.Raised
}
Index = 6
Text = ("Kernel")
{ Frame22 Frame
Expand Down
17 changes: 16 additions & 1 deletion src/i-nex/Data/report-ng.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,21 @@
#!/bin/bash
#if [ -e /proc/modules ]; then
# X=`cat /proc/modules | sed -e "s/ .*$//"`
# echo "Modules Loaded "$X
#fi
BINUTILS=("Binutils $(ld -v | egrep -o '[0-9]+\.[0-9\.]+')")
LNXCLIB=$(sed -n -e '/^.*\/libc-\([^/]*\)\.so$/{s//\1/;p;q}' < /proc/self/maps)
GNUMAKE=$(make --version 2>&1 | awk -F, '{print $1}' | awk '/GNU Make/{print $NF}')
PPP=$(pppd --version 2>&1| grep version | awk 'NR==1{print $3}')
#Dynamic linker (ldd)
DYNAMIC_LINKER=$(ldd -v > /dev/null 2>&1 && ldd -v || ldd --version |head -n 1 | awk 'NR==1{print $NF}')
NETTOOLS=$(ifconfig --version 2>&1 | grep tools | awk 'NR==1{print $NF}')
WIRELESS_TOOLS=$(iwconfig --version 2>&1 | awk '(NR==1 && ($3 == "version")) {print $4}')
# ---------------- PRINT ALL TO FILE
echo $BINUTILS > ~/.i-nex/Binutils.conf
echo $LNXCLIB > ~/.i-nex/Lnxclib.conf
echo $BINUTILS > ~/.i-nex/Binutils.conf
echo $GNUMAKE > ~/.i-nex/GNUMAKE.conf
echo $PPP > ~/.i-nex/PPP.conf
echo $DYNAMIC_LINKER > ~/.i-nex/DYNAMIC_LINKER.conf
echo $NETTOOLS > ~/.i-nex/NETTOOLS.conf
echo $WIRELESS_TOOLS > ~/.i-nex/WIRELESS_TOOLS.conf

0 comments on commit 419c327

Please sign in to comment.