diff -Naur I-Nex-master.orig/I-Nex/i-nex/.src/Distribution_Detect.module I-Nex-master/I-Nex/i-nex/.src/Distribution_Detect.module
--- I-Nex-master.orig/I-Nex/i-nex/.src/Distribution_Detect.module 2015-01-11 18:54:31.000000000 +0000
+++ I-Nex-master/I-Nex/i-nex/.src/Distribution_Detect.module 2015-05-27 17:07:09.186819143 +0000
@@ -18,65 +18,65 @@
Public Sub _inits()
Select Case Finfosys.SCREENFETCH["Distro"]
Case Like "*Mint*"
- Finfosys.PictureBox2.Picture = Picture["/etc/i-nex/Database/Distlogos/mint.png"]
+ Finfosys.PictureBox2.Picture = Picture["/usr/local/etc/i-nex/Database/Distlogos/mint.png"]
Finfosys.PictureBox2.Name = "mint.png"
Case Like "*Ubuntu*"
- Finfosys.PictureBox2.Picture = Picture["/etc/i-nex/Database/Distlogos/ubuntu.png"]
+ Finfosys.PictureBox2.Picture = Picture["/usr/local/etc/i-nex/Database/Distlogos/ubuntu.png"]
Finfosys.PictureBox2.Name = "ubuntu.png"
Case Like "*xUbuntu*"
- Finfosys.PictureBox2.Picture = Picture["/etc/i-nex/Database/Distlogos/xubuntu.png"]
+ Finfosys.PictureBox2.Picture = Picture["/usr/local/etc/i-nex/Database/Distlogos/xubuntu.png"]
Finfosys.PictureBox2.Name = "xubuntu.png"
Case Like "*SUSE*"
- Finfosys.PictureBox2.Picture = Picture["/etc/i-nex/Database/Distlogos/opensuse.png"]
+ Finfosys.PictureBox2.Picture = Picture["/usr/local/etc/i-nex/Database/Distlogos/opensuse.png"]
Finfosys.PictureBox2.Name = "opensuse.png"
Case Like "*Manjaro*"
- Finfosys.PictureBox2.Picture = Picture["/etc/i-nex/Database/Distlogos/manjaro.png"]
+ Finfosys.PictureBox2.Picture = Picture["/usr/local/etc/i-nex/Database/Distlogos/manjaro.png"]
Finfosys.PictureBox2.Name = "manjaro.png"
Case Like "*Fedora*"
- Finfosys.PictureBox2.Picture = Picture["/etc/i-nex/Database/Distlogos/fedora.png"]
+ Finfosys.PictureBox2.Picture = Picture["/usr/local/etc/i-nex/Database/Distlogos/fedora.png"]
Finfosys.PictureBox2.Name = "fedora.png"
Case Like "*Debian*"
- Finfosys.PictureBox2.Picture = Picture["/etc/i-nex/Database/Distlogos/debian.png"]
+ Finfosys.PictureBox2.Picture = Picture["/usr/local/etc/i-nex/Database/Distlogos/debian.png"]
Finfosys.PictureBox2.Name = "debian.png"
Case Like "*Arch Linux*"
- Finfosys.PictureBox2.Picture = Picture["/etc/i-nex/Database/Distlogos/archlinux.png"]
+ Finfosys.PictureBox2.Picture = Picture["/usr/local/etc/i-nex/Database/Distlogos/archlinux.png"]
Finfosys.PictureBox2.Name = "archlinux.png"
Case Like "*Sabayon*"
- Finfosys.PictureBox2.Picture = Picture["/etc/i-nex/Database/Distlogos/sabayon.png"]
+ Finfosys.PictureBox2.Picture = Picture["/usr/local/etc/i-nex/Database/Distlogos/sabayon.png"]
Finfosys.PictureBox2.Name = "sabayon.png"
Case Like "*Gentoo*"
- Finfosys.PictureBox2.Picture = Picture["/etc/i-nex/Database/Distlogos/gentoo.png"]
+ Finfosys.PictureBox2.Picture = Picture["/usr/local/etc/i-nex/Database/Distlogos/gentoo.png"]
Finfosys.PictureBox2.Name = "gentoo.png"
Case Like "*Red Hat Linux*"
- Finfosys.PictureBox2.Picture = Picture["/etc/i-nex/Database/Distlogos/redhat.png"]
+ Finfosys.PictureBox2.Picture = Picture["/usr/local/etc/i-nex/Database/Distlogos/redhat.png"]
Finfosys.PictureBox2.Name = "redhat.png"
Case Like "*Slackware*"
- Finfosys.PictureBox2.Picture = Picture["/etc/i-nex/Database/Distlogos/slackware.png"]
+ Finfosys.PictureBox2.Picture = Picture["/usr/local/etc/i-nex/Database/Distlogos/slackware.png"]
Finfosys.PictureBox2.Name = "slackware.png"
Case Like "*LMDE*"
- Finfosys.PictureBox2.Picture = Picture["/etc/i-nex/Database/Distlogos/Mint/linux_mint_LMDE_Big_sticker.png"]
+ Finfosys.PictureBox2.Picture = Picture["/usr/local/etc/i-nex/Database/Distlogos/Mint/linux_mint_LMDE_Big_sticker.png"]
Finfosys.PictureBox2.Name = "Mint/linux_mint_LMDE_Big_sticker.png"
Case Like "*elementary OS*"
- Finfosys.PictureBox2.Picture = Picture["/etc/i-nex/Database/Distlogos/elementaryos.png"]
+ Finfosys.PictureBox2.Picture = Picture["/usr/local/etc/i-nex/Database/Distlogos/elementaryos.png"]
Finfosys.PictureBox2.Name = "elementaryos.png"
Case Like "*LinuxDeepin*"
- Finfosys.PictureBox2.Picture = Picture["/etc/i-nex/Database/Distlogos/LinuxDeepin.png"]
+ Finfosys.PictureBox2.Picture = Picture["/usr/local/etc/i-nex/Database/Distlogos/LinuxDeepin.png"]
Finfosys.PictureBox2.Name = "LinuxDeepin.png"
Case Like "*netrunner*"
- Finfosys.PictureBox2.Picture = Picture["/etc/i-nex/Database/Distlogos/netrunner.png"]
+ Finfosys.PictureBox2.Picture = Picture["/usr/local/etc/i-nex/Database/Distlogos/netrunner.png"]
Finfosys.PictureBox2.Name = "netrunner.png"
End Select
If Finfosys.SCREENFETCH["Distro"] Like "*Ubuntu*" And Finfosys.SCREENFETCH["DE"] Like "*KDE*" Then
- Finfosys.PictureBox2.Picture = Picture["/etc/i-nex/Database/Distlogos/kubuntu.png"]
+ Finfosys.PictureBox2.Picture = Picture["/usr/local/etc/i-nex/Database/Distlogos/kubuntu.png"]
Finfosys.PictureBox2.Name = "kubuntu.png"
Endif
If Finfosys.SCREENFETCH["Distro"] Like "*Ubuntu*" And Finfosys.SCREENFETCH["DE"] Like "*XFCE*" Then
- Finfosys.PictureBox2.Picture = Picture["/etc/i-nex/Database/Distlogos/xubuntu.png"]
+ Finfosys.PictureBox2.Picture = Picture["/usr/local/etc/i-nex/Database/Distlogos/xubuntu.png"]
Finfosys.PictureBox2.Name = "xubuntu.png"
Endif
If Finfosys.SCREENFETCH["Distro"] Like "*Mint*" And Finfosys.SCREENFETCH["DE"] Like "*KDE*" Then
- Finfosys.PictureBox2.Picture = Picture["/etc/i-nex/Database/Distlogos/linux_mint_KDE_BIG_sticker.png"]
+ Finfosys.PictureBox2.Picture = Picture["/usr/local/etc/i-nex/Database/Distlogos/linux_mint_KDE_BIG_sticker.png"]
Finfosys.PictureBox2.Name = "Mint/linux_mint_KDE_BIG_sticker.png"
Endif
If Finfosys.SCREENFETCH["Distro"] Like "*Mint*" And Finfosys.SCREENFETCH["DE"] Like "*LXDE*" Then
@@ -84,11 +84,11 @@
Finfosys.PictureBox2.Name = "Mint/linux_mint_KDE_BIG_sticker.png"
Endif
If Finfosys.SCREENFETCH["Distro"] Like "*Mint*" And Finfosys.SCREENFETCH["DE"] Like "*Fluxbox*" Then
- Finfosys.PictureBox2.Picture = Picture["/etc/i-nex/Database/Distlogos/linux_mint_Fluxbox_BIG_sticker.png"]
+ Finfosys.PictureBox2.Picture = Picture["/usr/local/etc/i-nex/Database/Distlogos/linux_mint_Fluxbox_BIG_sticker.png"]
Finfosys.PictureBox2.Name = "Mint/linux_mint_Fluxbox_BIG_sticker.png"
Endif
If Finfosys.SCREENFETCH["Distro"] Like "*Mint*" And Finfosys.SCREENFETCH["DE"] Like "*XFCE*" Then
- Finfosys.PictureBox2.Picture = Picture["/etc/i-nex/Database/Distlogos/linux_mint_XFCE_Big_sticker.png"]
+ Finfosys.PictureBox2.Picture = Picture["/usr/local/etc/i-nex/Database/Distlogos/linux_mint_XFCE_Big_sticker.png"]
Finfosys.PictureBox2.Name = "Mint/linux_mint_XFCE_Big_sticker.png"
Endif
'Mageia
diff -Naur I-Nex-master.orig/I-Nex/i-nex/.src/FCpudb.module I-Nex-master/I-Nex/i-nex/.src/FCpudb.module
--- I-Nex-master.orig/I-Nex/i-nex/.src/FCpudb.module 2015-01-11 18:54:31.000000000 +0000
+++ I-Nex-master/I-Nex/i-nex/.src/FCpudb.module 2015-05-27 17:05:55.120151634 +0000
@@ -33,51 +33,51 @@
'
If Finfosys.Label14.Text Like "*Opteron*" Then 'Use Opteron databese if TextBox Like Opteron
Logs("Use AMD Opteron CPU Database", Logger.Info)
- buffer = File.Load("/etc/i-nex/Database/Opteron.json") 'Load the database to a temporary buffer
+ buffer = File.Load("/usr/local/etc/i-nex/Database/Opteron.json") 'Load the database to a temporary buffer
Finfosys.Label14.Text = Replace(Finfosys.Label14.Text, "AMD", "")
'
'
Else If Finfosys.Label14.Text Like "*amd*A6*" Then
Logs("Use AMD A6 CPU Database", Logger.Info)
- buffer = File.Load("/etc/i-nex/Database/A6.json") 'Load the database to a temporary buffer
+ buffer = File.Load("/usr/local/etc/i-nex/Database/A6.json") 'Load the database to a temporary buffer
Finfosys.Label14.Text = Replace(Finfosys.Label14.Text, "AMD", "")
'
'
Else If Finfosys.Label14.Text Like "*amd*" Then
Logs("Use AMD CPU Database", Logger.Info)
- buffer = File.Load("/etc/i-nex/Database/amd.json") 'Load the database to a temporary buffer
+ buffer = File.Load("/usr/local/etc/i-nex/Database/amd.json") 'Load the database to a temporary buffer
Finfosys.Label14.Text = Replace(Finfosys.Label14.Text, "AMD", "")
Else If Finfosys.Label14.Text Like "*Xeon*" Then 'Use Xeon databese if TextBox Like Xeon
Logs("Use Intel Xeon CPU Database", Logger.Info)
- buffer = File.Load("/etc/i-nex/Database/Xeon.json") 'Load the database to a temporary buffer
+ buffer = File.Load("/usr/local/etc/i-nex/Database/Xeon.json") 'Load the database to a temporary buffer
Finfosys.Label14.Text = Replace(Finfosys.Label14.Text, "Intel", "")
'
'
Else If Finfosys.Label14.Text Like "*i3*" Then
Logs("Use Intel i3 CPU Database", Logger.Info)
- buffer = File.Load("/etc/i-nex/Database/i3.json") 'Load the database to a temporary buffer
+ buffer = File.Load("/usr/local/etc/i-nex/Database/i3.json") 'Load the database to a temporary buffer
Finfosys.Label14.Text = Replace(Finfosys.Label14.Text, "Intel", "")
Else If Finfosys.Label14.Text Like "*i5*" Then
Logs("Use Intel i5 CPU Database", Logger.Info)
- buffer = File.Load("/etc/i-nex/Database/i5.json") 'Load the database to a temporary buffer
+ buffer = File.Load("/usr/local/etc/i-nex/Database/i5.json") 'Load the database to a temporary buffer
Finfosys.Label14.Text = Replace(Finfosys.Label14.Text, "Intel", "")
Else If Finfosys.Label14.Text Like "*i7*" Then
Logs("Use Intel i7 CPU Database", Logger.Info)
- buffer = File.Load("/etc/i-nex/Database/i7.json") 'Load the database to a temporary buffer
+ buffer = File.Load("/usr/local/etc/i-nex/Database/i7.json") 'Load the database to a temporary buffer
Finfosys.Label14.Text = Replace(Finfosys.Label14.Text, "Intel", "")
'
'
Else If Finfosys.Label14.Text Like "*atom*" Then
Logs("Use Intel Atom CPU Database", Logger.Info)
- buffer = File.Load("/etc/i-nex/Database/atom.json") 'Load the database to a temporary buffer
+ buffer = File.Load("/usr/local/etc/i-nex/Database/atom.json") 'Load the database to a temporary buffer
Finfosys.Label14.Text = Replace(Finfosys.Label14.Text, "Intel", "")
Else If Finfosys.Label14.Text Like "*intel*" Then
Logs("Use Intel CPU Database", Logger.Info)
- buffer = File.Load("/etc/i-nex/Database/intel.json") 'Load the database to a temporary buffer
+ buffer = File.Load("/usr/local/etc/i-nex/Database/intel.json") 'Load the database to a temporary buffer
Finfosys.Label14.Text = Replace(Finfosys.Label14.Text, "Intel", "")
Else If Finfosys.Label14.Text Like "*Pentium*" Then
Logs("Use Intel CPU Database", Logger.Info)
- buffer = File.Load("/etc/i-nex/Database/intel.json") 'Load the database to a temporary buffer
+ buffer = File.Load("/usr/local/etc/i-nex/Database/intel.json") 'Load the database to a temporary buffer
Endif
Logs("Decode CPU Database", Logger.Info)
@@ -120,7 +120,7 @@
If database["DATABASE"][z]["PROCESSOR_MODEL_NAME"] Like "*" & cpucache & "*" Then
Print database["DATABASE"][z]["PROCESSOR_MODEL_NAME"]
Finfosys.PictureBox3.Name = database["DATABASE"][z]["PROCESSOR_SOCKET_IMAGE"]
- Finfosys.PictureBox3.Picture = Picture["/etc/i-nex/Database/Logos/" & database["DATABASE"][z]["PROCESSOR_SOCKET_IMAGE"] & ""]
+ Finfosys.PictureBox3.Picture = Picture["/usr/local/etc/i-nex/Database/Logos/" & database["DATABASE"][z]["PROCESSOR_SOCKET_IMAGE"] & ""]
Finfosys.Label103.Text = " Integrated GPU: " & database["DATABASE"][z]["PROCESSOR_INTEGRATEDGRAPHIC"]
Finfosys.Label104.Text = " TDP: " & database["DATABASE"][z]["PROCESSOR_TDP"]
Finfosys.Label110.Text = " PPS: " & database["DATABASE"][z]["PROCESSOR_PROCESS_SIZE"]
diff -Naur I-Nex-master.orig/I-Nex/i-nex/.src/FGraphic.module I-Nex-master/I-Nex/i-nex/.src/FGraphic.module
--- I-Nex-master.orig/I-Nex/i-nex/.src/FGraphic.module 2015-01-11 18:54:31.000000000 +0000
+++ I-Nex-master/I-Nex/i-nex/.src/FGraphic.module 2015-05-27 16:49:35.690140282 +0000
@@ -28,14 +28,14 @@
Try status = File.Load("/sys/class/drm/" & Finfosys.ComboBox8.Text & "/status")
Try enabled = File.Load("/sys/class/drm/" & Finfosys.ComboBox8.Text & "/enabled")
Try dpms = File.Load("/sys/class/drm/" & Finfosys.ComboBox8.Text & "/dpms")
- Shell "cat /sys/class/drm/" & Finfosys.ComboBox8.Text & "/edid | /usr/bin/i-nex-edid | grep \"ASCII string\" | cut -d ':' -f 2" Wait To monitor_name
- Shell "cat /sys/class/drm/" & Finfosys.ComboBox8.Text & "/edid | /usr/bin/i-nex-edid | grep \"voltage level\"" Wait To voltage_level
- Shell "cat /sys/class/drm/" & Finfosys.ComboBox8.Text & "/edid | /usr/bin/i-nex-edid | grep \"Manufacturer:\" | cut -d ':' -f 2" Wait To manufacturer
- Shell "cat /sys/class/drm/" & Finfosys.ComboBox8.Text & "/edid | /usr/bin/i-nex-edid | grep \"Serial number:\" | cut -d ':' -f 2" Wait To serial_number
- Shell "cat /sys/class/drm/" & Finfosys.ComboBox8.Text & "/edid | /usr/bin/i-nex-edid | grep \"Gamma:\" | cut -d ':' -f 2" Wait To Gamma
- Shell "cat /sys/class/drm/" & Finfosys.ComboBox8.Text & "/edid | /usr/bin/i-nex-edid | grep \"Maximum image size:\" | cut -d ':' -f 2" Wait To Maximum_image_size
+ Shell "cat /sys/class/drm/" & Finfosys.ComboBox8.Text & "/edid | /usr/local/bin/i-nex-edid | grep \"ASCII string\" | cut -d ':' -f 2" Wait To monitor_name
+ Shell "cat /sys/class/drm/" & Finfosys.ComboBox8.Text & "/edid | /usr/local/bin/i-nex-edid | grep \"voltage level\"" Wait To voltage_level
+ Shell "cat /sys/class/drm/" & Finfosys.ComboBox8.Text & "/edid | /usr/local/bin/i-nex-edid | grep \"Manufacturer:\" | cut -d ':' -f 2" Wait To manufacturer
+ Shell "cat /sys/class/drm/" & Finfosys.ComboBox8.Text & "/edid | /usr/local/bin/i-nex-edid | grep \"Serial number:\" | cut -d ':' -f 2" Wait To serial_number
+ Shell "cat /sys/class/drm/" & Finfosys.ComboBox8.Text & "/edid | /usr/local/bin/i-nex-edid | grep \"Gamma:\" | cut -d ':' -f 2" Wait To Gamma
+ Shell "cat /sys/class/drm/" & Finfosys.ComboBox8.Text & "/edid | /usr/local/bin/i-nex-edid | grep \"Maximum image size:\" | cut -d ':' -f 2" Wait To Maximum_image_size
If IsNull(monitor_name) Then
- Shell "cat /sys/class/drm/" & Finfosys.ComboBox8.Text & "/edid | /usr/bin/i-nex-edid | grep \"Monitor name:\" | cut -d ':' -f 2" Wait To monitor_name
+ Shell "cat /sys/class/drm/" & Finfosys.ComboBox8.Text & "/edid | /usr/local/bin/i-nex-edid | grep \"Monitor name:\" | cut -d ':' -f 2" Wait To monitor_name
Endif
Endif
diff -Naur I-Nex-master.orig/I-Nex/i-nex/.src/FReport_Gen.class I-Nex-master/I-Nex/i-nex/.src/FReport_Gen.class
--- I-Nex-master.orig/I-Nex/i-nex/.src/FReport_Gen.class 2015-01-11 18:54:31.000000000 +0000
+++ I-Nex-master/I-Nex/i-nex/.src/FReport_Gen.class 2015-05-27 16:38:56.266800134 +0000
@@ -16,7 +16,7 @@
' along with this program. If not, see .
Public Sub Form_Open()
- Dim PASTEBIN_SITES As String[] = Dir("/usr/share/i-nex/pastebinit/pastebin.d/")
+ Dim PASTEBIN_SITES As String[] = Dir("/usr/local/share/i-nex/pastebinit/pastebin.d/")
Dim Conf As Integer
If Exist("~/.i-nex/lastsave") Then
ButtonBox1.Text = File.Load("" & User.Home & "/.i-nex/lastsave")
diff -Naur I-Nex-master.orig/I-Nex/i-nex/.src/FSystemInfo.class I-Nex-master/I-Nex/i-nex/.src/FSystemInfo.class
--- I-Nex-master.orig/I-Nex/i-nex/.src/FSystemInfo.class 2015-01-11 18:54:31.000000000 +0000
+++ I-Nex-master/I-Nex/i-nex/.src/FSystemInfo.class 2015-05-27 16:51:10.720141634 +0000
@@ -187,7 +187,7 @@
cFile = New Collection
aText.Add("[Libraries]")
- For Each sDir In ["/lib", "/usr/lib"]
+ For Each sDir In ["/lib", "/usr/lib", "/usr/local/lib"]
For Each sFile In RDir(sDir, "", gb.File, False).Sort(gb.IgnoreCase)
sFile = File.Name(sFile)
For Each sPattern In cSearch
diff -Naur I-Nex-master.orig/I-Nex/i-nex/.src/Finfosys.class I-Nex-master/I-Nex/i-nex/.src/Finfosys.class
--- I-Nex-master.orig/I-Nex/i-nex/.src/Finfosys.class 2015-01-11 18:54:31.000000000 +0000
+++ I-Nex-master/I-Nex/i-nex/.src/Finfosys.class 2015-05-27 16:48:11.363472963 +0000
@@ -292,7 +292,7 @@
Public Sub kernel()
Dim UNAME_DATA As String
- Try Exec ["/usr/bin/i-nex-uname"] Wait To UNAME_DATA
+ Try Exec ["/usr/local/bin/i-nex-uname"] Wait To UNAME_DATA
Try UNAME = JSON.Decode(UNAME_DATA)
Try TextLabel7.Text = "System name: " & UNAME["System_name"]
Try TextLabel16.Text = "Nodename: " & UNAME["Nodename"]
@@ -383,7 +383,7 @@
Dim GLIXNFO As String
Dim GLX As String[]
Dim strings As String
- Try Exec ["/usr/bin/i-nex-glinfo"] Wait To GLIXNFO
+ Try Exec ["/usr/local/bin/i-nex-glinfo"] Wait To GLIXNFO
GLX = Split(GLIXNFO, "\n", "")
For Each strings In GLX
If strings Like "*OpenGL vendor string:*" Then
@@ -425,8 +425,8 @@
If IsNull(Kernel_driver_in_use) Or IsSpace(Kernel_driver_in_use) = True Then
Try Exec [ChkPrm.ChkExecDir("xdriinfo")] Wait To Kernel_driver_in_use
Endif
- Exec ["/bin/bash", "/usr/bin/i-nex-lspci", "nonprefetchable"] Wait To memory_non_prefetchable
- Exec ["/bin/bash", "/usr/bin/i-nex-lspci", "prefetchable"] Wait To memory_prefetchable
+ Exec ["/bin/bash", "/usr/local/bin/i-nex-lspci", "nonprefetchable"] Wait To memory_non_prefetchable
+ Exec ["/bin/bash", "/usr/local/bin/i-nex-lspci", "prefetchable"] Wait To memory_prefetchable
Label136.Text = "Kernel driver in use: " & Replace(Kernel_driver_in_use, "\n", "")
Label64.Text = "Total Memory prefetchable: " & Replace(memory_prefetchable, "\n", " - ")
diff -Naur I-Nex-master.orig/I-Nex/i-nex/.src/MCPUSAGE.module I-Nex-master/I-Nex/i-nex/.src/MCPUSAGE.module
--- I-Nex-master.orig/I-Nex/i-nex/.src/MCPUSAGE.module 2015-01-11 18:54:31.000000000 +0000
+++ I-Nex-master/I-Nex/i-nex/.src/MCPUSAGE.module 2015-05-27 16:46:45.696805167 +0000
@@ -18,7 +18,7 @@
Private CPUusageOutput As String
Public Sub GetUSAGE()
- CPUusage = Exec ["/usr/bin/i-nex-cpusage"] For Input Output As "CPUusage"
+ CPUusage = Exec ["/usr/local/bin/i-nex-cpusage"] For Input Output As "CPUusage"
End
diff -Naur I-Nex-master.orig/I-Nex/i-nex/.src/MConvert.module I-Nex-master/I-Nex/i-nex/.src/MConvert.module
--- I-Nex-master.orig/I-Nex/i-nex/.src/MConvert.module 2015-01-11 18:54:31.000000000 +0000
+++ I-Nex-master/I-Nex/i-nex/.src/MConvert.module 2015-05-27 17:02:14.870148922 +0000
@@ -8,7 +8,7 @@
Dim CPUDBINTEL As New Collection
Dim CPUDBINTELADD As New Collection
JSON_FILE = JSON.Decode(File.Load(inputS))
- CPUDBINTEL = JSON.Decode(File.Load("/etc/i-nex/Database/NULLD"))
+ CPUDBINTEL = JSON.Decode(File.Load("/usr/local/etc/i-nex/Database/NULLD"))
For z = 0 To JSON_FILE["DATABASE"].Count - 1
If JSON_FILE["DATABASE"][z]["PROCESSOR_MODEL_NAME"] Like CPUName Then
Print JSON_FILE["DATABASE"][z]["PROCESSOR_MODEL_NAME"]
diff -Naur I-Nex-master.orig/I-Nex/i-nex/.src/Mdecode.module I-Nex-master/I-Nex/i-nex/.src/Mdecode.module
--- I-Nex-master.orig/I-Nex/i-nex/.src/Mdecode.module 2015-01-11 18:54:31.000000000 +0000
+++ I-Nex-master/I-Nex/i-nex/.src/Mdecode.module 2015-05-27 17:01:49.336815489 +0000
@@ -35,7 +35,7 @@
vendor = Upper(vendor)
device = Upper(device)
- PCIDEVS = Open "/etc/i-nex/SIV/pcidevs.txt"
+ PCIDEVS = Open "/usr/local/etc/i-nex/SIV/pcidevs.txt"
For Each sLine In PCIDEVS.Lines
sLine = Trim(sLine)
If Not sLine Then Continue
diff -Naur I-Nex-master.orig/I-Nex/i-nex/.src/Reports/MPastebinit.module I-Nex-master/I-Nex/i-nex/.src/Reports/MPastebinit.module
--- I-Nex-master.orig/I-Nex/i-nex/.src/Reports/MPastebinit.module 2015-01-11 18:54:31.000000000 +0000
+++ I-Nex-master/I-Nex/i-nex/.src/Reports/MPastebinit.module 2015-05-27 16:38:13.956799642 +0000
@@ -8,7 +8,7 @@
TextInfo("Send report to " & FReport_Gen.ComboBox1.Text & "")
PBV(0.5)
Wait 0.1
- Shell "/usr/share/i-nex/pastebinit/pastebinit -b http://" & Service & " -i " & Directory & "" Wait To links
+ Shell "/usr/local/share/i-nex/pastebinit/pastebinit -b http://" & Service & " -i " & Directory & "" Wait To links
PBV(0.7)
links = Replace(links, "\n", "")
PBV(0.8)
diff -Naur I-Nex-master.orig/I-Nex/i-nex/.src/Reports/VALIDATE.module I-Nex-master/I-Nex/i-nex/.src/Reports/VALIDATE.module
--- I-Nex-master.orig/I-Nex/i-nex/.src/Reports/VALIDATE.module 2015-01-11 18:54:31.000000000 +0000
+++ I-Nex-master/I-Nex/i-nex/.src/Reports/VALIDATE.module 2015-05-27 16:45:42.223471241 +0000
@@ -142,7 +142,7 @@
Public Function SendReportToServer(whereisfile As String, Submit As String, Url As String, Optional user_name As String, Optional api_key As String) As String
Dim RedirectURL As String
- Shell "/usr/bin/curl --form uploadfile=@" & whereisfile & " --form submit=\"" & Submit & "\" " & Url & " --form user_name=" & user_name & " --form api_key=" & api_key & "" Wait To RedirectURL
+ Shell "/usr/local/bin/curl --form uploadfile=@" & whereisfile & " --form submit=\"" & Submit & "\" " & Url & " --form user_name=" & user_name & " --form api_key=" & api_key & "" Wait To RedirectURL
RedirectURL = Replace(Replace(RedirectURL, "\r", ""), "\n", "")
If RedirectURL Begins "http" Then
Return Subst(RedirectURL)
diff -Naur I-Nex-master.orig/I-Nex/i-nex/.src/i2c.module I-Nex-master/I-Nex/i-nex/.src/i2c.module
--- I-Nex-master.orig/I-Nex/i-nex/.src/i2c.module 2015-01-11 18:54:31.000000000 +0000
+++ I-Nex-master/I-Nex/i-nex/.src/i2c.module 2015-05-27 17:00:32.123481351 +0000
@@ -6,7 +6,7 @@
Dim I2C_BUSES As Collection
Dim i As Integer
Dim KERNEL_MODULE As String
- I2C_BUSES = JSON.Decode(File.Load("/etc/i-nex/Database/i2c/devices.json"))
+ I2C_BUSES = JSON.Decode(File.Load("/usr/local/etc/i-nex/Database/i2c/devices.json"))
For Each element In RDir("/sys/bus/pci/devices/", "*:*")
vendor = Replace(File.Load("/sys/bus/pci/devices/" & element & "/vendor"), "\n", "")
device = Replace(File.Load("/sys/bus/pci/devices/" & element & "/device"), "\n", "")
diff -Naur I-Nex-master.orig/I-Nex/i-nex/Data/gputemp I-Nex-master/I-Nex/i-nex/Data/gputemp
--- I-Nex-master.orig/I-Nex/i-nex/Data/gputemp 2015-01-11 18:54:31.000000000 +0000
+++ I-Nex-master/I-Nex/i-nex/Data/gputemp 2015-05-27 16:43:54.076803474 +0000
@@ -23,7 +23,7 @@
TEMP="0"
if lspci -n | grep 0300 | grep -q 10de; then
- [ -f /usr/bin/nvidia-smi ] && TEMP=`/usr/bin/nvidia-smi -q -x | grep 'gpu_temp' | awk '{ print $1 }' | sed 's,,,g'`
+ [ -f /usr/local/bin/nvidia-smi ] && TEMP=`/usr/local/bin/nvidia-smi -q -x | grep 'gpu_temp' | awk '{ print $1 }' | sed 's,,,g'`
fi
if lspci -n | grep 0300 | grep -q 1002; then
@@ -32,7 +32,7 @@
else
XORG="/etc/X11/xorg-fglrx.conf"
fi
- [ -f /usr/bin/aticonfig ] && TEMP=`/usr/bin/aticonfig -i $XORG --od-gettemperature | grep Temperature | cut -f 2 -d "-" | cut -f 1 -d "." | sed -e "s, ,,"`
+ [ -f /usr/local/bin/aticonfig ] && TEMP=`/usr/local/bin/aticonfig -i $XORG --od-gettemperature | grep Temperature | cut -f 2 -d "-" | cut -f 1 -d "." | sed -e "s, ,,"`
fi
echo "${TEMP} C"
\ No newline at end of file
diff -Naur I-Nex-master.orig/I-Nex/i-nex/Data/screenfetch-dev I-Nex-master/I-Nex/i-nex/Data/screenfetch-dev
--- I-Nex-master.orig/I-Nex/i-nex/Data/screenfetch-dev 2015-01-11 18:54:31.000000000 +0000
+++ I-Nex-master/I-Nex/i-nex/Data/screenfetch-dev 2015-05-27 16:59:32.693480624 +0000
@@ -535,7 +535,7 @@
elif [ -f /usr/share/doc/tc/release.txt ]; then distro="TinyCore"
elif [ -f /etc/sabayon-edition ]; then distro="Sabayon"; fi
else
- if [[ -x /usr/bin/sw_vers ]] && /usr/bin/sw_vers | grep -i "Mac OS X" >/dev/null; then
+ if [[ -x /usr/local/bin/sw_vers ]] && /usr/local/bin/sw_vers | grep -i "Mac OS X" >/dev/null; then
distro="Mac OS X"
elif [[ -f /var/run/dmesg.boot ]]; then
distro=$(awk 'BEGIN {
@@ -1417,7 +1417,7 @@
#TODO: Find a way to extract and read E17 .cfg files ( google seems to have nothing ). atyoung
'E17') Win_theme=${E_CONF_PROFILE};;
'echinus') Win_theme="Not Present";;
- 'Emerald') if [ -f $HOME/.emerald/theme/theme.ini ]; then Win_theme="$(for a in /usr/share/emerald/themes/* $HOME/.emerald/themes/*; do cmp "$HOME/.emerald/theme/theme.ini" "$a/theme.ini" &>/dev/null && basename "$a"; done)"; fi;;
+ 'Emerald') if [ -f $HOME/.emerald/theme/theme.ini ]; then Win_theme="$(for a in /usr/local/share/emerald/themes/* $HOME/.emerald/themes/*; do cmp "$HOME/.emerald/theme/theme.ini" "$a/theme.ini" &>/dev/null && basename "$a"; done)"; fi;;
'Finder') Win_theme="Not Present";;
'FluxBox'|'Fluxbox') if [ -f $HOME/.fluxbox/init ]; then Win_theme="$(awk -F"/" '/styleFile/ {print $NF}' $HOME/.fluxbox/init)"; fi;;
'FVWM') Win_theme="Not Present";;
@@ -1681,23 +1681,23 @@
fi
fi
# /etc/gtk-2.0/gtkrc compatability
- if [[ -f /etc/gtk-2.0/gtkrc && ! -f $HOME/.gtkrc-2.0 && ! -f $HOME/.gtkrc.mine ]]; then
- if grep -q gtk-theme-name /etc/gtk-2.0/gtkrc; then
- gtk2Theme=$(awk -F'"' '/^gtk-theme-name/ {print $2}' /etc/gtk-2.0/gtkrc)
+ if [[ -f /usr/local/etc/gtk-2.0/gtkrc && ! -f $HOME/.gtkrc-2.0 && ! -f $HOME/.gtkrc.mine ]]; then
+ if grep -q gtk-theme-name /usr/local/etc/gtk-2.0/gtkrc; then
+ gtk2Theme=$(awk -F'"' '/^gtk-theme-name/ {print $2}' /usr/local/etc/gtk-2.0/gtkrc)
fi
- if grep -q gtk-fallback-theme-name /etc/gtk-2.0/gtkrc && ! [ "x$gtk2Theme" = "x" ]; then
- gtk2Theme=$(awk -F'"' '/^gtk-fallback-theme-name/ {print $2}' /etc/gtk-2.0/gtkrc)
+ if grep -q gtk-fallback-theme-name /usr/local//etc/gtk-2.0/gtkrc && ! [ "x$gtk2Theme" = "x" ]; then
+ gtk2Theme=$(awk -F'"' '/^gtk-fallback-theme-name/ {print $2}' /usr/local/etc/gtk-2.0/gtkrc)
fi
- if grep -q icon-theme /etc/gtk-2.0/gtkrc; then
- gtkIcons=$(awk -F'"' '/^icon-theme/ {print $2}' /etc/gtk-2.0/gtkrc)
+ if grep -q icon-theme /usr/local/etc/gtk-2.0/gtkrc; then
+ gtkIcons=$(awk -F'"' '/^icon-theme/ {print $2}' //usr/local/etc/gtk-2.0/gtkrc)
fi
- if grep -q gtk-fallback-icon-theme /etc/gtk-2.0/gtkrc && ! [ "x$gtkIcons" = "x" ]; then
- gtkIcons=$(awk -F'"' '/^gtk-fallback-icon-theme/ {print $2}' /etc/gtk-2.0/gtkrc)
+ if grep -q gtk-fallback-icon-theme /usr/local/etc/gtk-2.0/gtkrc && ! [ "x$gtkIcons" = "x" ]; then
+ gtkIcons=$(awk -F'"' '/^gtk-fallback-icon-theme/ {print $2}' /usr/local/etc/gtk-2.0/gtkrc)
fi
- if grep -q font /etc/gtk-2.0/gtkrc; then
- gtkFont=$(awk -F'"' '/^gtk-font-name/ {print $2}' /etc/gtk-2.0/gtkrc)
+ if grep -q font /usr/local/etc/gtk-2.0/gtkrc; then
+ gtkFont=$(awk -F'"' '/^gtk-font-name/ {print $2}' /usr/local/etc/gtk-2.0/gtkrc)
fi
fi
diff -Naur I-Nex-master.orig/JSON/i-nex-dimms I-Nex-master/JSON/i-nex-dimms
--- I-Nex-master.orig/JSON/i-nex-dimms 2015-01-11 18:54:31.000000000 +0000
+++ I-Nex-master/JSON/i-nex-dimms 2015-05-27 16:42:32.650135747 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/local/bin/perl -w
#
# EEPROM data decoder for SDRAM DIMM modules
#
diff -Naur I-Nex-master.orig/debian/i-nex-library.desktop I-Nex-master/debian/i-nex-library.desktop
--- I-Nex-master.orig/debian/i-nex-library.desktop 2015-01-11 18:54:31.000000000 +0000
+++ I-Nex-master/debian/i-nex-library.desktop 2015-05-27 16:36:24.476798230 +0000
@@ -3,8 +3,8 @@
Name=I-Nex Library
Comment=I-Nex System Library Information.
GenericName=I-Nex System Library Information.
-Exec=/usr/bin/i-nex.gambas --library
-Icon=/usr/share/pixmaps/i-nex-128.png
+Exec=/usr/local/bin/i-nex.gambas --library
+Icon=/usr/local/share/pixmaps/i-nex-128.png
Terminal=false
StartupNotify=true
Type=Application
diff -Naur I-Nex-master.orig/debian/i-nex.desktop I-Nex-master/debian/i-nex.desktop
--- I-Nex-master.orig/debian/i-nex.desktop 2015-01-11 18:54:31.000000000 +0000
+++ I-Nex-master/debian/i-nex.desktop 2015-05-27 16:35:55.890131332 +0000
@@ -151,8 +151,8 @@
GenericName[vi]=I-Nex Viewing System Device Information.
GenericName[zh_CN]=I-Nex Viewing System Device Information.
GenericName[zh_TW]=I-Nex Viewing System Device Information.
-Exec=/usr/bin/i-nex.gambas
-Icon=/usr/share/pixmaps/i-nex-128.png
+Exec=/usr/local/bin/i-nex.gambas
+Icon=/usr/local/share/pixmaps/i-nex-128.png
Terminal=false
StartupNotify=true
Type=Application
diff -Naur I-Nex-master.orig/debian/i-nex.triggers I-Nex-master/debian/i-nex.triggers
--- I-Nex-master.orig/debian/i-nex.triggers 2015-01-11 18:54:31.000000000 +0000
+++ I-Nex-master/debian/i-nex.triggers 2015-05-27 16:35:22.426797615 +0000
@@ -1,4 +1,4 @@
-activate /usr/share/menu
-activate /usr/share/applications
-activate /usr/share/pixmaps
-activate /usr/share/man
+activate /usr/local/share/menu
+activate /usr/local/share/applications
+activate /usr/local/share/pixmaps
+activate /usr/local/share/man
diff -Naur I-Nex-master.orig/dists/i-nex.spec I-Nex-master/dists/i-nex.spec
--- I-Nex-master.orig/dists/i-nex.spec 2015-01-11 18:54:31.000000000 +0000
+++ I-Nex-master/dists/i-nex.spec 2015-05-27 16:52:41.146809402 +0000
@@ -116,16 +116,16 @@
cat > %{name}.sh < %{name}.desktop
%build
diff -Naur I-Nex-master.orig/i-nex.mk I-Nex-master/i-nex.mk
--- I-Nex-master.orig/i-nex.mk 2015-01-11 18:54:31.000000000 +0000
+++ I-Nex-master/i-nex.mk 2015-05-27 16:54:40.630144498 +0000
@@ -12,7 +12,7 @@
libx11 = $(shell pkg-config x11 --cflags --libs)
libxext = $(shell pkg-config xext --cflags --libs)
ARCH = $(shell uname -m)
-GBC = /usr/bin/gbc3
+GBC = /usr/local/bin/gbc3
GBCOPTS = -eagtpm
GBA = gba3
CC = gcc
@@ -37,7 +37,7 @@
additional_confflags := --disable-sse2
endif
ifeq ($(ARCH),x86_64)
-additional_confflags := -O2
+additional_confflags :=
endif
ifeq ($(LSB_CS),precise)
@@ -55,7 +55,7 @@
ERROR_STRING = $(ERROR_COLOR)✖
WARN_STRING = $(WARN_COLOR)⚑
-sysconfdir = /etc
+sysconfdir = /usr/local/etc
DATABASE_CPU_LOGOS_DIR = ../Database/Logos
DATABASE_CPU_LOGOS = $(wildcard $(DATABASE_CPU_LOGOS_DIR)/*.gif)
DATABASE_DIST_LOGOS_DIR = ../Database/Distlogos
diff -Naur I-Nex-master.orig/pastebinit I-Nex-master/pastebinit
--- I-Nex-master.orig/pastebinit 2015-01-11 18:54:31.000000000 +0000
+++ I-Nex-master/pastebinit 2015-05-27 16:53:57.873477138 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/local/bin/python3
# -*- coding: utf-8 -*-
# Author: Stéphane Graber
@@ -80,12 +80,12 @@
def preloadPastebins():
# Check several places for config files:
- # - global config in /etc/pastebin.d
+ # - global config in /usr/local/etc/pastebin.d
# - for source checkout, config in the checkout
# - user's overrides in ~/.pastebin.d
# Files found later override files found earlier.
pastebind = {}
- for confdir in ['/usr/share/i-nex/pastebinit/pastebin.d', '/etc/pastebin.d',
+ for confdir in ['/usr/local/share/i-nex/pastebinit/pastebin.d', '/etc/pastebin.d',
'/usr/local/etc/pastebin.d',
os.path.expanduser('~/.pastebin.d'),
os.path.join(