diff options
| author | sengedev | 2024-03-09 14:06:36 +0800 |
|---|---|---|
| committer | sengedev | 2024-03-09 14:06:36 +0800 |
| commit | 5a18677f857bcf4caf78f44fbed9ff3dbc224cc6 (patch) | |
| tree | cb48b6b7449f4722adffd8382c7fb1910ac08a83 | |
| parent | d0484e74a9231cec2a231958e142aeffa72d9133 (diff) | |
| download | aur-5a18677f857bcf4caf78f44fbed9ff3dbc224cc6.tar.gz | |
Fix some bugs.
| -rw-r--r-- | .SRCINFO | 5 | ||||
| -rw-r--r-- | 1panel.install | 4 | ||||
| -rw-r--r-- | 1panel.service | 17 | ||||
| -rw-r--r-- | PKGBUILD | 60 |
4 files changed, 41 insertions, 45 deletions
@@ -1,6 +1,6 @@ pkgbase = 1panel-git pkgdesc = 1Panel, a modern open source linux panel. - pkgver = 1.10.1_alpha.5 + pkgver = 2024.3.9.archlinux pkgrel = 1 url = https://1panel.cn install = 1panel.install @@ -17,8 +17,7 @@ pkgbase = 1panel-git optdepends = docker-compose conflicts = 1panel-dev-bin conflicts = 1panel-bin - source = 1panel-git::git+https://github.com/1Panel-dev/1Panel.git#branch=dev - source = 1panel.service + source = 1panel-git::git+https://github.com/1Panel-dev/1Panel.git sha256sums = SKIP pkgname = 1panel-git diff --git a/1panel.install b/1panel.install index 2d4e25e922d8..aacd4195c02f 100644 --- a/1panel.install +++ b/1panel.install @@ -54,7 +54,6 @@ post_install() { unset _1panel_entrance } -## arg 1: the old package version pre_remove() { echo -e "================== Uninstalling 1Panel ==================" echo -e "\033[34mStopping systemd service...\033[0m" @@ -62,8 +61,7 @@ pre_remove() { } post_remove() { - echo -e "\033[34mDeleting 1Panel configuration files...\033[0m" - rm -rf /opt/1panel + echo -e "\033[34mPlease delete /opt/1panel files after backup them...\033[0m" echo -e "=================== 1Panel uninstalled ==================" } diff --git a/1panel.service b/1panel.service deleted file mode 100644 index a06b4e45f716..000000000000 --- a/1panel.service +++ /dev/null @@ -1,17 +0,0 @@ -[Unit] -Description=1Panel, a modern open source linux panel -After=syslog.target network.target - -[Service] -ExecStart=/usr/bin/1panel -ExecReload=/bin/kill -s HUP $MAINPID -Restart=always -RestartSec=5 -LimitNOFILE=1048576 -LimitNPROC=1048576 -LimitCORE=1048576 -Delegate=yes -KillMode=process - -[Install] -WantedBy=multi-user.target
\ No newline at end of file @@ -2,16 +2,12 @@ # Contributor: Senge Dev <sengedev at gmail dot com> pkgname=1panel-git -pkgver=1.10.1_alpha.5 +pkgver=2024.3.9.archlinux pkgrel=1 pkgdesc="1Panel, a modern open source linux panel." arch=('x86_64' 'aarch64') url="https://1panel.cn" license=('GPL-3.0-or-later') -_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.install makedepends=( 'pwgen' @@ -26,25 +22,45 @@ optdepends=( 'docker-compose' ) conflicts=('1panel-dev-bin' '1panel-bin') -source=( - "${pkgname}"::"git+https://github.com/1Panel-dev/1Panel.git#branch=dev" - "1panel.service" -) -sha256sums=( - "SKIP" - "1d85c0b4a0b7256c75bb14d10d2bfb29fdcfb4c7ebc99622b024bd61be314ea3" -) +source=("${pkgname}"::"git+https://github.com/1Panel-dev/1Panel.git") +sha256sums=("SKIP") build() { - # Override the upstream 1pctl script - echo "#!/bin/bash" > ${srcdir}/1pctl - echo "BASE_DIR=/opt" >> ${srcdir}/1pctl - echo "ORIGINAL_PORT=${_1panel_original_port}" >> ${srcdir}/1pctl - echo "ORIGINAL_VERSION=v${pkgver//_/-}" >> ${srcdir}/1pctl - echo "ORIGINAL_ENTRANCE=${_1panel_original_entrance}" >> ${srcdir}/1pctl - echo "ORIGINAL_USERNAME=${_1panel_original_username}" >> ${srcdir}/1pctl - echo "ORIGINAL_PASSWORD=${_1panel_original_password}" >> ${srcdir}/1pctl - echo "1panel --help" >> ${srcdir}/1pctl + # Create 1pctl file, or 1Panel systemd service cannot start. + cat > ${srcdir}/1pctl << EOF +#!/bin/bash +BASE_DIR=/opt +ORIGINAL_PORT=`expr $RANDOM % 55535 + 10000` +ORIGINAL_VERSION=${pkgver} +ORIGINAL_ENTRANCE=$(pwgen -nABCv 10 1) +ORIGINAL_USERNAME=$(pwgen -nABCv 10 1) +ORIGINAL_PASSWORD=$(pwgen -nBCv 20 1) +1panel \$@ +EOF + # Create systemd service + cat> ${srcdir}/1panel.service << EOF +[Unit] +Description=1Panel, a modern open source linux panel +After=syslog.target network.target + +[Service] +ExecStart=/usr/bin/1panel +ExecReload=/bin/kill -s HUP \$MAINPID +Restart=always +RestartSec=5 +LimitNOFILE=1048576 +LimitNPROC=1048576 +LimitCORE=1048576 +Delegate=yes +KillMode=process + +[Install] +WantedBy=multi-user.target +EOF + # Edit the source code using sed + sed -i 's/当前已经是最新版本/当前版本为AUR版本，如需更新，请使用AUR更新/g' ${srcdir}/${pkgname}/frontend/src/lang/modules/zh.ts + sed -i 's/當前已經是最新版本/當前版本為AUR版本，如需更新，請使用AUR更新/g' ${srcdir}/${pkgname}/frontend/src/lang/modules/tw.ts + sed -i 's/It is currently the latest version/It is ArchLinux AUR version, if you want to update it, please use AUR./g' ${srcdir}/${pkgname}/frontend/src/lang/modules/en.ts # Compile 1Panel using Makefile cd ${srcdir}/${pkgname} make build_all |