Skip to content

Commit

Permalink
All LOGOS and database files placed in /etc/i-nex
Browse files Browse the repository at this point in the history
  • Loading branch information
eloaders committed Sep 4, 2014
1 parent 2aff727 commit 5bdc044
Show file tree
Hide file tree
Showing 249 changed files with 82 additions and 37 deletions.
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
31 changes: 31 additions & 0 deletions Database/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
#!/usr/bin/make -f

include ../i-nex.mk

install: database-cpu-logos \
database-dist-logos \
database-cpu-json \
database-i2c-json

database-cpu-logos:
mkdir -p $(DESTDIR)$(sysconfdir)/$(PN)
mkdir -p $(DESTDIR)$(sysconfdir)/$(PN)/Database
mkdir -p $(DESTDIR)$(sysconfdir)/$(PN)/Database/Logos
$(INSTALL) 0755 $(DATABASE_CPU_LOGOS) $(DESTDIR)$(sysconfdir)/$(PN)/Database/Logos/

database-dist-logos:
mkdir -p $(DESTDIR)$(sysconfdir)/$(PN)
mkdir -p $(DESTDIR)$(sysconfdir)/$(PN)/Database
mkdir -p $(DESTDIR)$(sysconfdir)/$(PN)/Database/Distlogos
$(INSTALL) 0755 $(DATABASE_DIST_LOGOS) $(DESTDIR)$(sysconfdir)/$(PN)/Database/Distlogos/

database-cpu-json:
mkdir -p $(DESTDIR)$(sysconfdir)/$(PN)
mkdir -p $(DESTDIR)$(sysconfdir)/$(PN)/Database
$(INSTALL) 0755 $(DATABASE_CPU_JSON) $(DESTDIR)$(sysconfdir)/$(PN)/Database/

database-i2c-json:
mkdir -p $(DESTDIR)$(sysconfdir)/$(PN)
mkdir -p $(DESTDIR)$(sysconfdir)/$(PN)/Database
mkdir -p $(DESTDIR)$(sysconfdir)/$(PN)/Database/i2c
$(INSTALL) 0755 $(DATABASE_I2C_JSON) $(DESTDIR)$(sysconfdir)/$(PN)/Database/i2c/
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
44 changes: 22 additions & 22 deletions I-Nex/i-nex/.src/Distribution_Detect.module
Original file line number Diff line number Diff line change
Expand Up @@ -18,77 +18,77 @@
Public Sub _inits()
Select Case Finfosys.SCREENFETCH["Distro"]
Case Like "*Mint*"
Finfosys.PictureBox2.Picture = Picture["Database/Distlogos/mint.png"]
Finfosys.PictureBox2.Picture = Picture["/etc/i-nex/Database/Distlogos/mint.png"]
Finfosys.PictureBox2.Name = "mint.png"
Case Like "*Ubuntu*"
Finfosys.PictureBox2.Picture = Picture["Database/Distlogos/ubuntu.png"]
Finfosys.PictureBox2.Picture = Picture["/etc/i-nex/Database/Distlogos/ubuntu.png"]
Finfosys.PictureBox2.Name = "ubuntu.png"
Case Like "*xUbuntu*"
Finfosys.PictureBox2.Picture = Picture["Database/Distlogos/xubuntu.png"]
Finfosys.PictureBox2.Picture = Picture["/etc/i-nex/Database/Distlogos/xubuntu.png"]
Finfosys.PictureBox2.Name = "xubuntu.png"
Case Like "*SUSE*"
Finfosys.PictureBox2.Picture = Picture["Database/Distlogos/opensuse.png"]
Finfosys.PictureBox2.Picture = Picture["/etc/i-nex/Database/Distlogos/opensuse.png"]
Finfosys.PictureBox2.Name = "opensuse.png"
Case Like "*Manjaro*"
Finfosys.PictureBox2.Picture = Picture["Database/Distlogos/manjaro.png"]
Finfosys.PictureBox2.Picture = Picture["/etc/i-nex/Database/Distlogos/manjaro.png"]
Finfosys.PictureBox2.Name = "manjaro.png"
Case Like "*Fedora*"
Finfosys.PictureBox2.Picture = Picture["Database/Distlogos/fedora.png"]
Finfosys.PictureBox2.Picture = Picture["/etc/i-nex/Database/Distlogos/fedora.png"]
Finfosys.PictureBox2.Name = "fedora.png"
Case Like "*Debian*"
Finfosys.PictureBox2.Picture = Picture["Database/Distlogos/debian.png"]
Finfosys.PictureBox2.Picture = Picture["/etc/i-nex/Database/Distlogos/debian.png"]
Finfosys.PictureBox2.Name = "debian.png"
Case Like "*Arch Linux*"
Finfosys.PictureBox2.Picture = Picture["Database/Distlogos/archlinux.png"]
Finfosys.PictureBox2.Picture = Picture["/etc/i-nex/Database/Distlogos/archlinux.png"]
Finfosys.PictureBox2.Name = "archlinux.png"
Case Like "*Sabayon*"
Finfosys.PictureBox2.Picture = Picture["Database/Distlogos/sabayon.png"]
Finfosys.PictureBox2.Picture = Picture["/etc/i-nex/Database/Distlogos/sabayon.png"]
Finfosys.PictureBox2.Name = "sabayon.png"
Case Like "*Gentoo*"
Finfosys.PictureBox2.Picture = Picture["Database/Distlogos/gentoo.png"]
Finfosys.PictureBox2.Picture = Picture["/etc/i-nex/Database/Distlogos/gentoo.png"]
Finfosys.PictureBox2.Name = "gentoo.png"
Case Like "*Red Hat Linux*"
Finfosys.PictureBox2.Picture = Picture["Database/Distlogos/redhat.png"]
Finfosys.PictureBox2.Picture = Picture["/etc/i-nex/Database/Distlogos/redhat.png"]
Finfosys.PictureBox2.Name = "redhat.png"
Case Like "*Slackware*"
Finfosys.PictureBox2.Picture = Picture["Database/Distlogos/slackware.png"]
Finfosys.PictureBox2.Picture = Picture["/etc/i-nex/Database/Distlogos/slackware.png"]
Finfosys.PictureBox2.Name = "slackware.png"
Case Like "*LMDE*"
Finfosys.PictureBox2.Picture = Picture["Database/Distlogos/Mint/linux_mint_LMDE_Big_sticker.png"]
Finfosys.PictureBox2.Picture = Picture["/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["Database/Distlogos/elementaryos.png"]
Finfosys.PictureBox2.Picture = Picture["/etc/i-nex/Database/Distlogos/elementaryos.png"]
Finfosys.PictureBox2.Name = "elementaryos.png"
Case Like "*LinuxDeepin*"
Finfosys.PictureBox2.Picture = Picture["Database/Distlogos/LinuxDeepin.png"]
Finfosys.PictureBox2.Picture = Picture["/etc/i-nex/Database/Distlogos/LinuxDeepin.png"]
Finfosys.PictureBox2.Name = "LinuxDeepin.png"
Case Like "*netrunner*"
Finfosys.PictureBox2.Picture = Picture["Database/Distlogos/netrunner.png"]
Finfosys.PictureBox2.Picture = Picture["/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["Database/Distlogos/kubuntu.png"]
Finfosys.PictureBox2.Picture = Picture["/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["Database/Distlogos/xubuntu.png"]
Finfosys.PictureBox2.Picture = Picture["/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["Database/Distlogos/Mint/linux_mint_KDE_BIG_sticker.png"]
Finfosys.PictureBox2.Picture = Picture["/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
Finfosys.PictureBox2.Picture = Picture["Database/Distlogos/Mint/linux_mint_LXDE_BIG_sticker.png"]
Finfosys.PictureBox2.Picture = Picture["Database/Distlogos/linux_mint_LXDE_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 "*Fluxbox*" Then
Finfosys.PictureBox2.Picture = Picture["Database/Distlogos/Mint/linux_mint_Fluxbox_BIG_sticker.png"]
Finfosys.PictureBox2.Picture = Picture["/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["Database/Distlogos/Mint/linux_mint_XFCE_Big_sticker.png"]
Finfosys.PictureBox2.Picture = Picture["/etc/i-nex/Database/Distlogos/linux_mint_XFCE_Big_sticker.png"]
Finfosys.PictureBox2.Name = "Mint/linux_mint_XFCE_Big_sticker.png"
Endif
'Mageia
Expand Down
22 changes: 11 additions & 11 deletions I-Nex/i-nex/.src/FCpudb.module
Original file line number Diff line number Diff line change
Expand Up @@ -33,51 +33,51 @@ Function _inits()
'
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("Database/Opteron") 'Load the database to a temporary buffer
buffer = File.Load("/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("Database/A6") 'Load the database to a temporary buffer
buffer = File.Load("/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("Database/amd") 'Load the database to a temporary buffer
buffer = File.Load("/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("Database/Xeon") 'Load the database to a temporary buffer
buffer = File.Load("/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("Database/i3") 'Load the database to a temporary buffer
buffer = File.Load("/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("Database/i5") 'Load the database to a temporary buffer
buffer = File.Load("/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("Database/i7") 'Load the database to a temporary buffer
buffer = File.Load("/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("Database/atom") 'Load the database to a temporary buffer
buffer = File.Load("/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("Database/intel") 'Load the database to a temporary buffer
buffer = File.Load("/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("Database/intel") 'Load the database to a temporary buffer
buffer = File.Load("/etc/i-nex/Database/intel.json") 'Load the database to a temporary buffer
Endif

Logs("Decode CPU Database", Logger.Info)
Expand Down Expand Up @@ -120,7 +120,7 @@ Function _inits()
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["Database/Logos/" & database["DATABASE"][z]["PROCESSOR_SOCKET_IMAGE"] & ""]
Finfosys.PictureBox3.Picture = Picture["/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"]
Expand Down
2 changes: 1 addition & 1 deletion I-Nex/i-nex/.src/i2c.module
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Public Sub _inits()
Dim I2C_BUSES As Collection
Dim i As Integer
Dim KERNEL_MODULE As String
I2C_BUSES = JSON.Decode(File.Load("Database/i2c/devices.json"))
I2C_BUSES = JSON.Decode(File.Load("/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", "")
Expand Down
8 changes: 6 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ make: build-inex build-json build-pixmaps
install: install-pastebinit-and-other \
install-pixmaps install-changelogs install-manpages \
install-docs install-json install-inex install-scripts \
install-udev-rule link-inex
install-udev-rule link-inex install-database

clean: clean-pixmaps clean-json clean-inex clean-all

Expand Down Expand Up @@ -76,7 +76,11 @@ install-scripts:

@echo -e '\033[1;32mInstall Scripts...\033[0m'
$(MAKE) -C Scripts install


install-database:
@echo -e '\033[1;32mInstall database files...\033[0m'
$(MAKE) -C Database install

clean-pixmaps:

$(MAKE) -C pixmaps clean
Expand Down
12 changes: 11 additions & 1 deletion i-nex.mk
Original file line number Diff line number Diff line change
Expand Up @@ -53,4 +53,14 @@ WARN_COLOR = \033[93m
ACTION_COLOR = \033[95m
OK_STRING = $(OK_COLOR)
ERROR_STRING = $(ERROR_COLOR)
WARN_STRING = $(WARN_COLOR)
WARN_STRING = $(WARN_COLOR)

sysconfdir = /etc
DATABASE_CPU_LOGOS_DIR = ../Database/Logos
DATABASE_CPU_LOGOS = $(wildcard $(DATABASE_CPU_LOGOS_DIR)/*.gif)
DATABASE_DIST_LOGOS_DIR = ../Database/Distlogos
DATABASE_DIST_LOGOS = $(wildcard $(DATABASE_DIST_LOGOS_DIR)/*.png)
DATABASE_CPU_JSON_DIR = ../Database
DATABASE_CPU_JSON = $(wildcard $(DATABASE_CPU_JSON_DIR)/*.json)
DATABASE_I2C_JSON_DIR = ../Database/i2c
DATABASE_I2C_JSON = $(wildcard $(DATABASE_I2C_JSON_DIR)/*.json)

0 comments on commit 5bdc044

Please sign in to comment.