Compare commits

...

3 Commits

Author SHA1 Message Date
Piyush मिश्रः 6e77384340 index.html bug fix 2021-12-24 22:34:17 +05:30
Piyush मिश्रः 45bc871ad2
Merge pull request #2 from darajnish/master
Updated PKGBUILD
2021-12-24 22:26:37 +05:30
Rajnish Mishra 3f5714139c Updated PKGBUILD 2021-12-24 20:13:51 +05:30
4 changed files with 35 additions and 39 deletions

2
Cargo.lock generated
View File

@ -1206,7 +1206,7 @@ dependencies = [
[[package]] [[package]]
name = "rasp_mgr" name = "rasp_mgr"
version = "2.0.3" version = "2.0.4"
dependencies = [ dependencies = [
"async-std", "async-std",
"clap", "clap",

View File

@ -1,6 +1,6 @@
[package] [package]
name = "rasp_mgr" name = "rasp_mgr"
version = "2.0.3" version = "2.0.4"
description = "A simple server manager for local newtrok" description = "A simple server manager for local newtrok"
authors = ["PiyushXCoder <piyush.raj.kit@gmail.com>"] authors = ["PiyushXCoder <piyush.raj.kit@gmail.com>"]
license = "GPL-3.0-only" license = "GPL-3.0-only"
@ -12,17 +12,17 @@ edition = "2018"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies] [dependencies]
clap = "2.33.3" clap = "2.33"
toml = "0.5.8" toml = "0.5"
tide = "0.16.0" tide = "0.16"
async-std = { version = "1.6.0", features = ["attributes"] } async-std = { version = "1.6", features = ["attributes"] }
serde = { version = "1.0", features = ["derive"] } serde = { version = "1.0", features = ["derive"] }
humantime = "2.1.0" humantime = "2.1"
sys-info = "0.9.0" sys-info = "0.9"
libc = "0.2.97" libc = "0.2"
mnt = "0.3.1" mnt = "0.3"
libmedium = "0.6.0" libmedium = "0.6"

View File

@ -1,35 +1,29 @@
# Maintainer: Rajnish Mishra <contact.rajnishmishra@gmail.com> # Maintainer: Rajnish Mishra <contact.rajnishmishra@gmail.com>
pkgname=raspmgr-git pkgname=raspmgr
_pkgname=Rasp-Manager _pkgname=Rasp-Manager
pkgver=1.0.0.r11.1901188 pkgver=2.0.2
pkgrel=1 pkgrel=1
pkgdesc="A simple server manager for local network (especially for Raspberry Pi)" pkgdesc="A simple server manager for local network (especially for Raspberry Pi)"
arch=('any') arch=('any')
url="https://github.com/PiyushXCoder/${_pkgname}" url="https://github.com/PiyushXCoder/${_pkgname}"
license=('GPL3') license=('GPL3')
makedepends=('git' 'cargo') makedepends=('git' 'cargo')
source=("git+${url}.git") source=("${_pkgname}-${pkgver}.tar.gz::https://github.com/PiyushXCoder/${_pkgname}/archive/V${pkgver}.tar.gz")
md5sums=('SKIP') sha256sums=('76df28aa278424420914737567085a358eddbbe23840103e72d59f2749d26838')
pkgver() {
cd "${_pkgname}"
v=$(grep -R -A3 '^version =' Cargo.toml | grep 'version =' | cut -d\" -f2)
printf "$v.r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
}
prepare() { prepare() {
cd "${_pkgname}" cd "${_pkgname}-${pkgver}"
sed -i 's/port = 8080/port = 80/g;s/\".\/static\"/\"\/var\/lib\/rasp_mgr\/static\"/g' Config.toml sed -i 's/port = 8080/port = 80/g;s/\".\/static\"/\"\/var\/lib\/rasp_mgr\/static\"/g' Config.toml
} }
build() { build() {
cd "${_pkgname}" cd "${_pkgname}-${pkgver}"
cargo build --release cargo build --release
} }
package() { package() {
cd "${_pkgname}" cd "${_pkgname}-${pkgver}"
install -Dm755 "target/release/rasp_mgr" "${pkgdir}/usr/bin/rasp_mgr" install -Dm755 "target/release/rasp_mgr" "${pkgdir}/usr/bin/rasp_mgr"
install -Dm644 "Config.toml" "${pkgdir}/etc/rasp_mgr/Config.toml" install -Dm644 "Config.toml" "${pkgdir}/etc/rasp_mgr/Config.toml"
install -Dm644 "rasp_mgr.service" "${pkgdir}/usr/lib/systemd/system/rasp_mgr.service" install -Dm644 "rasp_mgr.service" "${pkgdir}/usr/lib/systemd/system/rasp_mgr.service"

View File

@ -1,5 +1,6 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
@ -8,6 +9,7 @@
<title>Rasp Manager</title> <title>Rasp Manager</title>
<link rel="stylesheet" href="awsm.min.css"> <link rel="stylesheet" href="awsm.min.css">
</head> </head>
<body> <body>
<header> <header>
<h1>Rasp Manager</h1> <h1>Rasp Manager</h1>
@ -30,10 +32,9 @@
<script src="jquery-3.6.0.min.js"></script> <script src="jquery-3.6.0.min.js"></script>
<script> <script>
$.get("/sysinfo", function(data) { $.get("/sysinfo", function (data) {
var data = JSON.parse(data);
var area = $('#sysinfo'); var area = $('#sysinfo');
var pushin = function(parent, label, dat) { var pushin = function (parent, label, dat) {
parent.append($('<b>').append(label)) parent.append($('<b>').append(label))
.append(dat) .append(dat)
.append('<br>'); .append('<br>');
@ -43,10 +44,10 @@
var fset = $('<fieldset>'); var fset = $('<fieldset>');
fset.append($('<legend>').append('System')); fset.append($('<legend>').append('System'));
pushin(fset, 'System Name: ', data.system_name); pushin(fset, 'System Name: ', data.system_name);
if(data.os_version != undefined) if (data.os_version != undefined)
pushin(fset, 'Operating System Version: ', data.os_version); pushin(fset, 'Operating System Version: ', data.os_version);
pushin(fset, 'Kernel Version: ', data.kernel_ver); pushin(fset, 'Kernel Version: ', data.kernel_ver);
if(data.last_uadate != undefined) if (data.last_uadate != undefined)
pushin(fset, 'Last Update: ', data.last_uadate); pushin(fset, 'Last Update: ', data.last_uadate);
pushin(fset, 'Hostname: ', data.hostname); pushin(fset, 'Hostname: ', data.hostname);
pushin(fset, 'Boot Time: ', data.boot_time); pushin(fset, 'Boot Time: ', data.boot_time);
@ -68,38 +69,39 @@
var fset = $('<fieldset>'); var fset = $('<fieldset>');
fset.append($('<legend>').append('Disk')); fset.append($('<legend>').append('Disk'));
fset.append($('<small>', {style:'color: grey'}).append('available/total<br>')); fset.append($('<small>', { style: 'color: grey' }).append('available/total<br>'));
data.disk.forEach(e => { data.disk.forEach(e => {
pushin(fset, '→ '+e.mount, ''); pushin(fset, '→ ' + e.mount, '');
var available = e.available; var available = e.available;
var total = e.total; var total = e.total;
var unit_available = 'MB'; var unit_available = 'MB';
var unit_total = 'MB'; var unit_total = 'MB';
if(available > 1024) { if (available > 1024) {
available /= 1024; available /= 1024;
unit_available = 'GB'; unit_available = 'GB';
} }
if(total > 1024) { if (total > 1024) {
total /= 1024; total /= 1024;
unit_total = 'GB'; unit_total = 'GB';
} }
pushin(fset, '', +available.toFixed(2)+ ' '+unit_available+'/' +total.toFixed(2)+ ' '+unit_total); pushin(fset, '', +available.toFixed(2) + ' ' + unit_available + '/' + total.toFixed(2) + ' ' + unit_total);
}); });
area.append(fset); area.append(fset);
var fset = $('<fieldset>'); var fset = $('<fieldset>');
fset.append($('<legend>').append('Temperature')); fset.append($('<legend>').append('Temperature'));
data.temperature.forEach(e => { data.temperature.forEach(e => {
pushin(fset, '→ '+e.label+': ', e.temp.toFixed(2) +'°C'); pushin(fset, '→ ' + e.label + ': ', e.temp.toFixed(2) + '°C');
}); });
area.append(fset); area.append(fset);
}).fail(function() { }).fail(function () {
$('#sysinfo').empty().append($('<span>', {style: 'color: red'}) $('#sysinfo').empty().append($('<span>', { style: 'color: red' })
.append('Error in getting system information!')); .append('Error in getting system information!'));
}); });
</script> </script>
</body> </body>
</html> </html>