summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorsengedev2024-03-08 23:53:21 +0800
committersengedev2024-03-08 23:53:21 +0800
commit43a9805faa60f3118758ba9863fad4915abaf487 (patch)
tree481ab9039b40cfef02a209f71d5b896e7d2794b9
parentbae92561393d36f40db0c64a9d27a14a73fe0a99 (diff)
downloadaur-43a9805faa60f3118758ba9863fad4915abaf487.tar.gz
Uploaded 1panel-git, 1panel-dev-bin is conflicts with it.
-rw-r--r--.SRCINFO7
-rw-r--r--1panel.install (renamed from 1panel-dev-bin.install)0
-rw-r--r--PKGBUILD14
3 files changed, 12 insertions, 9 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 5c86e94da5a9..dc68f39c2683 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -3,16 +3,17 @@ pkgbase = 1panel-dev-bin
pkgver = 1.10.1_alpha.5
pkgrel = 1
url = https://1panel.cn
- install = 1panel-dev-bin.install
+ install = 1panel.install
arch = x86_64
arch = aarch64
license = GPL-3.0-or-later
makedepends = pwgen
- depends = docker
- depends = docker-compose
optdepends = ufw
optdepends = firewalld
+ optdepends = docker
+ optdepends = docker-compose
conflicts = 1panel-bin
+ conflicts = 1panel-git
source_x86_64 = 1panel-dev-bin-1.10.1-alpha.5-amd64.tar.gz::https://resource.fit2cloud.com/1panel/package/dev/v1.10.1-alpha.5/release/1panel-v1.10.1-alpha.5-linux-amd64.tar.gz
sha256sums_x86_64 = 21b68b6434bde83045727f150b035ecb002e8166602ff4e0b0ee2836b5cacdcb
source_aarch64 = 1panel-dev-bin-1.10.1-alpha.5-arm64.tar.gz::https://resource.fit2cloud.com/1panel/package/dev/v1.10.1-alpha.5/release/1panel-v1.10.1-alpha.5-linux-arm64.tar.gz
diff --git a/1panel-dev-bin.install b/1panel.install
index 170fdd0c6add..170fdd0c6add 100644
--- a/1panel-dev-bin.install
+++ b/1panel.install
diff --git a/PKGBUILD b/PKGBUILD
index e5ae53dd46ed..f86bc4ef546f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,19 +12,21 @@ _1panel_original_port=`expr $RANDOM % 55535 + 10000`
_1panel_original_username=$(pwgen -nABCv 10 1)
_1panel_original_password=$(pwgen -nBCv 20 1)
_1panel_original_entrance=$(pwgen -nABCv 10 1)
-install=1panel-dev-bin.install
-depends=(
- 'docker'
- 'docker-compose'
-)
+install=1panel.install
+
makedepends=(
'pwgen'
)
optdepends=(
'ufw'
'firewalld'
+ 'docker'
+ 'docker-compose'
+)
+conflicts=(
+ '1panel-bin'
+ '1panel-git'
)
-conflicts=('1panel-bin')
source_aarch64=("${pkgname}-${pkgver//_/-}-arm64.tar.gz::https://resource.fit2cloud.com/1panel/package/dev/v${pkgver//_/-}/release/1panel-v${pkgver//_/-}-linux-arm64.tar.gz")
source_x86_64=("${pkgname}-${pkgver//_/-}-amd64.tar.gz::https://resource.fit2cloud.com/1panel/package/dev/v${pkgver//_/-}/release/1panel-v${pkgver//_/-}-linux-amd64.tar.gz")
sha256sums_x86_64=("21b68b6434bde83045727f150b035ecb002e8166602ff4e0b0ee2836b5cacdcb")