Compare commits

..

No commits in common. "master" and "V2.0.3" have entirely different histories.

4 changed files with 39 additions and 35 deletions

2
Cargo.lock generated
View File

@ -1206,7 +1206,7 @@ dependencies = [
[[package]] [[package]]
name = "rasp_mgr" name = "rasp_mgr"
version = "2.0.4" version = "2.0.3"
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.4" version = "2.0.3"
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" clap = "2.33.3"
toml = "0.5" toml = "0.5.8"
tide = "0.16" tide = "0.16.0"
async-std = { version = "1.6", features = ["attributes"] } async-std = { version = "1.6.0", features = ["attributes"] }
serde = { version = "1.0", features = ["derive"] } serde = { version = "1.0", features = ["derive"] }
humantime = "2.1" humantime = "2.1.0"
sys-info = "0.9" sys-info = "0.9.0"
libc = "0.2" libc = "0.2.97"
mnt = "0.3" mnt = "0.3.1"
libmedium = "0.6" libmedium = "0.6.0"

View File

@ -1,29 +1,35 @@
# Maintainer: Rajnish Mishra <contact.rajnishmishra@gmail.com> # Maintainer: Rajnish Mishra <contact.rajnishmishra@gmail.com>
pkgname=raspmgr pkgname=raspmgr-git
_pkgname=Rasp-Manager _pkgname=Rasp-Manager
pkgver=2.0.2 pkgver=1.0.0.r11.1901188
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=("${_pkgname}-${pkgver}.tar.gz::https://github.com/PiyushXCoder/${_pkgname}/archive/V${pkgver}.tar.gz") source=("git+${url}.git")
sha256sums=('76df28aa278424420914737567085a358eddbbe23840103e72d59f2749d26838') md5sums=('SKIP')
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}-${pkgver}" cd "${_pkgname}"
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}-${pkgver}" cd "${_pkgname}"
cargo build --release cargo build --release
} }
package() { package() {
cd "${_pkgname}-${pkgver}" cd "${_pkgname}"
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,6 +1,5 @@
<!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">
@ -9,7 +8,6 @@
<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>
@ -33,6 +31,7 @@
<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))
@ -103,5 +102,4 @@
}); });
</script> </script>
</body> </body>
</html> </html>