Register shared Linux CLI links with deb lifecycle management for 0.2.4
This commit is contained in:
1 parent
dc8edf0df6
commit
3c6c4a0e90
11 files changed
+240
-17
No files matched your search
@@ -29,10 +29,10 @@
|
|||||||
| `desktop/Ads.Desktop/` | Avalonia 多设备工作台,管理独立连接、自动端口分配、USB 模拟、多个 scrcpy 窗口、电脑名、按天滚动日志及托盘;`Assets/` 保存图标资源 | C#、AXAML、XML(csproj)、PNG |
|
| `desktop/Ads.Desktop/` | Avalonia 多设备工作台,管理独立连接、自动端口分配、USB 模拟、多个 scrcpy 窗口、电脑名、按天滚动日志及托盘;`Assets/` 保存图标资源 | C#、AXAML、XML(csproj)、PNG |
|
||||||
| `desktop/Ads.Desktop.Tests/` | 桌面客户端单元测试 | C#、XML(csproj) |
|
| `desktop/Ads.Desktop.Tests/` | 桌面客户端单元测试 | C#、XML(csproj) |
|
||||||
| `desktop/Ads.Desktop.Smoke/` | 桌面离屏布局、连接及可选真机冒烟验证入口 | C#、XML(csproj) |
|
| `desktop/Ads.Desktop.Smoke/` | 桌面离屏布局、连接及可选真机冒烟验证入口 | C#、XML(csproj) |
|
||||||
| `deploy/` | 服务器/设备端部署脚本与 Caddy、Nginx、systemd、launchd 配置示例 | Shell、服务/代理配置、XML(plist)、Markdown |
|
| `deploy/` | 服务器/设备端部署脚本、Linux deb CLI 命令链接维护脚本与 Caddy、Nginx、systemd、launchd 配置示例 | Shell、服务/代理配置、XML(plist)、Markdown |
|
||||||
| `deploy/windows/` | Windows 设备端准备与计划任务部署、桌面安装包定义及配置示例 | PowerShell、Inno Setup(ISS)、JSON、Markdown |
|
| `deploy/windows/` | Windows 设备端准备与计划任务部署、桌面安装包定义及配置示例 | PowerShell、Inno Setup(ISS)、JSON、Markdown |
|
||||||
| `scripts/` | 项目构建、版本递增、Windows PE 依赖检查及安装包、Linux deb 打包及本地启动脚本 | PowerShell、Shell、Python |
|
| `scripts/` | 项目构建、版本递增、Windows PE 依赖检查与安装包、Linux deb 打包及本地启动脚本 | PowerShell、Shell、Python |
|
||||||
| `tests/` | Python 桥接测试、三端集成测试及可选真机验证 | Python |
|
| `tests/` | Python 桥接、三端集成、deb 安装/升级/卸载回归及可选真机验证 | Python |
|
||||||
| `docs/` | 协议、部署、验证及旧局域网桥接说明 | Markdown |
|
| `docs/` | 协议、部署、验证及旧局域网桥接说明 | Markdown |
|
||||||
| `config/` | 本地配置容器;`private/` 保存私有凭据等配置,已被 Git 忽略,不纳入发布包 | 环境变量文件等配置格式,无业务源码 |
|
| `config/` | 本地配置容器;`private/` 保存私有凭据等配置,已被 Git 忽略,不纳入发布包 | 环境变量文件等配置格式,无业务源码 |
|
||||||
| `adb/` | 本地第三方 AOSP ADB 源码检出,用于参考与研究;已被 Git 忽略,不是 adb 可执行文件目录 | 主要为 C++,另含 Python、Shell、Android.bp |
|
| `adb/` | 本地第三方 AOSP ADB 源码检出,用于参考与研究;已被 Git 忽略,不是 adb 可执行文件目录 | 主要为 C++,另含 Python、Shell、Android.bp |
|
||||||
|
|||||||
Generated
+6
-6
@@ -4,7 +4,7 @@ version = 4
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "ads-agent"
|
name = "ads-agent"
|
||||||
version = "0.2.3"
|
version = "0.2.4"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"ads-core",
|
"ads-core",
|
||||||
"ads-management",
|
"ads-management",
|
||||||
@@ -21,7 +21,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "ads-client"
|
name = "ads-client"
|
||||||
version = "0.2.3"
|
version = "0.2.4"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"ads-core",
|
"ads-core",
|
||||||
"anyhow",
|
"anyhow",
|
||||||
@@ -32,7 +32,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "ads-core"
|
name = "ads-core"
|
||||||
version = "0.2.3"
|
version = "0.2.4"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"bytes",
|
"bytes",
|
||||||
@@ -51,7 +51,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "ads-management"
|
name = "ads-management"
|
||||||
version = "0.2.3"
|
version = "0.2.4"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"ads-core",
|
"ads-core",
|
||||||
"anyhow",
|
"anyhow",
|
||||||
@@ -67,7 +67,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "ads-usb"
|
name = "ads-usb"
|
||||||
version = "0.2.3"
|
version = "0.2.4"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"clap",
|
"clap",
|
||||||
@@ -78,7 +78,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "adsctl"
|
name = "adsctl"
|
||||||
version = "0.2.3"
|
version = "0.2.4"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"ads-core",
|
"ads-core",
|
||||||
"ads-management",
|
"ads-management",
|
||||||
|
|||||||
+1
-1
@@ -3,7 +3,7 @@ members = ["crates/ads-core", "agent", "client", "usb", "crates/ads-management",
|
|||||||
resolver = "2"
|
resolver = "2"
|
||||||
|
|
||||||
[workspace.package]
|
[workspace.package]
|
||||||
version = "0.2.3"
|
version = "0.2.4"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
license = "MIT"
|
license = "MIT"
|
||||||
|
|
||||||
|
|||||||
@@ -38,10 +38,10 @@ Windows 现支持可选的 [USB ADB 模拟](docs/windows-usb.md),默认网络
|
|||||||
| `desktop/Ads.Desktop/` | Avalonia 多设备工作台,管理独立连接、自动端口分配、USB 模拟、多个 scrcpy 窗口及托盘;`Assets/` 保存图标资源 | C#、AXAML、XML(csproj)、PNG |
|
| `desktop/Ads.Desktop/` | Avalonia 多设备工作台,管理独立连接、自动端口分配、USB 模拟、多个 scrcpy 窗口及托盘;`Assets/` 保存图标资源 | C#、AXAML、XML(csproj)、PNG |
|
||||||
| `desktop/Ads.Desktop.Tests/` | 桌面客户端单元测试 | C#、XML(csproj) |
|
| `desktop/Ads.Desktop.Tests/` | 桌面客户端单元测试 | C#、XML(csproj) |
|
||||||
| `desktop/Ads.Desktop.Smoke/` | 桌面离屏布局、连接及可选真机冒烟验证入口 | C#、XML(csproj) |
|
| `desktop/Ads.Desktop.Smoke/` | 桌面离屏布局、连接及可选真机冒烟验证入口 | C#、XML(csproj) |
|
||||||
| `deploy/` | 服务器/设备端部署脚本与 Caddy、Nginx、systemd、launchd 配置示例 | Shell、服务/代理配置、XML(plist)、Markdown |
|
| `deploy/` | 服务器/设备端部署脚本、Linux deb CLI 命令链接维护脚本与 Caddy、Nginx、systemd、launchd 配置示例 | Shell、服务/代理配置、XML(plist)、Markdown |
|
||||||
| `deploy/windows/` | Windows 设备端准备与计划任务部署、桌面安装包定义及配置示例 | PowerShell、Inno Setup(ISS)、JSON、Markdown |
|
| `deploy/windows/` | Windows 设备端准备与计划任务部署、桌面安装包定义及配置示例 | PowerShell、Inno Setup(ISS)、JSON、Markdown |
|
||||||
| `scripts/` | 项目构建、Windows 安装包、Linux deb/tar.gz 打包及本地启动脚本 | PowerShell、Shell |
|
| `scripts/` | 项目构建、版本递增、Windows PE 依赖检查与安装包、Linux deb 打包及本地启动脚本 | PowerShell、Shell、Python |
|
||||||
| `tests/` | Python 桥接测试、三端集成测试及可选真机验证 | Python |
|
| `tests/` | Python 桥接、三端集成、deb 安装/升级/卸载回归及可选真机验证 | Python |
|
||||||
| `docs/` | 协议、部署、验证及旧局域网桥接说明 | Markdown |
|
| `docs/` | 协议、部署、验证及旧局域网桥接说明 | Markdown |
|
||||||
| `config/` | 本地配置容器;`private/` 保存私有凭据等配置,已被 Git 忽略,不纳入发布包 | 环境变量文件等配置格式,无业务源码 |
|
| `config/` | 本地配置容器;`private/` 保存私有凭据等配置,已被 Git 忽略,不纳入发布包 | 环境变量文件等配置格式,无业务源码 |
|
||||||
| `adb/` | 本地第三方 AOSP ADB 源码检出,用于参考与研究;已被 Git 忽略,不是 adb 可执行文件目录 | 主要为 C++,另含 Python、Shell、Android.bp |
|
| `adb/` | 本地第三方 AOSP ADB 源码检出,用于参考与研究;已被 Git 忽略,不是 adb 可执行文件目录 | 主要为 C++,另含 Python、Shell、Android.bp |
|
||||||
@@ -228,7 +228,7 @@ python tests/real_device.py --adb-server 192.168.5.222:5037 --serial 192.168.100
|
|||||||
|
|
||||||
Agent 管理发行入口:`scripts/build-desktop.ps1` 生成 `bin/desktop-win-x64/`,`scripts/build-flutter.ps1` 生成 `bin/flutter-win-x64/`,两者均包含 Agent/CLI,均不包含私有凭据。Avalonia 本机 Agent 托盘使用 `scripts/start-agent-tray.ps1`。
|
Agent 管理发行入口:`scripts/build-desktop.ps1` 生成 `bin/desktop-win-x64/`,`scripts/build-flutter.ps1` 生成 `bin/flutter-win-x64/`,两者均包含 Agent/CLI,均不包含私有凭据。Avalonia 本机 Agent 托盘使用 `scripts/start-agent-tray.ps1`。
|
||||||
|
|
||||||
Linux 安装包:`bash scripts/build-linux-packages.sh`,提供 `.deb` 和 `.tar.gz`,详见 [Linux 打包](docs/linux-packaging.md)。
|
Linux 安装包:`bash scripts/build-linux-packages.sh`,提供 `.deb` 安装包,详见 [Linux 打包](docs/linux-packaging.md)。
|
||||||
|
|
||||||
Linux 原生虚拟 USB 已在 Ubuntu 实机通过 CLI 验证,部署和权限说明见 [Linux USB](docs/linux-usb.md)。Avalonia Linux GUI 已接入 pkexec 挂载,Flutter Linux 尚未接入。
|
Linux 原生虚拟 USB 已在 Ubuntu 实机通过 CLI 验证,部署和权限说明见 [Linux USB](docs/linux-usb.md)。Avalonia Linux GUI 已接入 pkexec 挂载,Flutter Linux 尚未接入。
|
||||||
|
|
||||||
@@ -248,3 +248,5 @@ Windows 发布精简:Avalonia 合并托管程序集、保留原生库;Flutte
|
|||||||
升级从 `Programs/TTSTD` 迁至 `Programs/TongTongStudio` 后,两个桌面客户端自动修复保存的工具路径,保留有效自定义路径及私有凭据。Flutter 在启动与连接前进行迁移和文件检查。
|
升级从 `Programs/TTSTD` 迁至 `Programs/TongTongStudio` 后,两个桌面客户端自动修复保存的工具路径,保留有效自定义路径及私有凭据。Flutter 在启动与连接前进行迁移和文件检查。
|
||||||
|
|
||||||
Android APK 交付目录固定为 `bin/apk/`(APK 格式,无业务源码,自动生成且 Git 忽略);`android_agent` 的 assembleRelease / assembleDebug 成功后自动复制到该目录。
|
Android APK 交付目录固定为 `bin/apk/`(APK 格式,无业务源码,自动生成且 Git 忽略);`android_agent` 的 assembleRelease / assembleDebug 成功后自动复制到该目录。
|
||||||
|
|
||||||
|
Linux 桌面 deb 安装后自动通过 update-alternatives 注册 `/usr/bin/adsctl`、`ads-agent`、`ads-client`、`ads-usb`,支持多包共存及卸载回退;无需手动创建链接,详见 [Linux 打包](docs/linux-packaging.md)。
|
||||||
@@ -0,0 +1,31 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
# Template expanded into Debian maintainer scripts by build-linux-packages.sh.
|
||||||
|
set -eu
|
||||||
|
package='@PACKAGE@'
|
||||||
|
priority='@PRIORITY@'
|
||||||
|
hook='@HOOK@'
|
||||||
|
prefix="/opt/ttstd/$package"
|
||||||
|
# DPKG_ROOT also permits real dpkg lifecycle tests without touching host links.
|
||||||
|
root=${DPKG_ROOT:-}
|
||||||
|
alternatives() {
|
||||||
|
if [ -n "$root" ]; then
|
||||||
|
update-alternatives --root "$root" "$@"
|
||||||
|
else
|
||||||
|
update-alternatives "$@"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
case "$hook:${1:-}" in
|
||||||
|
postinst:configure|postinst:triggered|postinst:abort-upgrade|postinst:abort-remove|postinst:abort-deconfigure)
|
||||||
|
for tool in adsctl ads-agent ads-client ads-usb; do
|
||||||
|
if [ -x "$root$prefix/$tool" ]; then
|
||||||
|
alternatives --install "/usr/bin/$tool" "$tool" "$prefix/$tool" "$priority"
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
;;
|
||||||
|
prerm:remove|prerm:deconfigure|postrm:remove|postrm:purge|postrm:disappear)
|
||||||
|
for tool in adsctl ads-agent ads-client ads-usb; do
|
||||||
|
alternatives --remove "$tool" "$prefix/$tool"
|
||||||
|
done
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
exit 0
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk">
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
<PropertyGroup><Version>0.2.3</Version><OutputType>WinExe</OutputType><TargetFramework>net8.0</TargetFramework><Nullable>enable</Nullable><ImplicitUsings>enable</ImplicitUsings></PropertyGroup>
|
<PropertyGroup><Version>0.2.4</Version><OutputType>WinExe</OutputType><TargetFramework>net8.0</TargetFramework><Nullable>enable</Nullable><ImplicitUsings>enable</ImplicitUsings></PropertyGroup>
|
||||||
<ItemGroup><PackageReference Include="Avalonia.Desktop" Version="11.3.8"/><PackageReference Include="Semi.Avalonia" Version="11.3.7.3"/><PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0"/></ItemGroup>
|
<ItemGroup><PackageReference Include="Avalonia.Desktop" Version="11.3.8"/><PackageReference Include="Semi.Avalonia" Version="11.3.7.3"/><PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0"/></ItemGroup>
|
||||||
<ItemGroup><AvaloniaResource Include="Assets/**"/></ItemGroup></Project>
|
<ItemGroup><AvaloniaResource Include="Assets/**"/></ItemGroup></Project>
|
||||||
@@ -18,3 +18,21 @@ Flutter 当前仓库没有 Linux 原生宿主,不能直接从 Windows bundle
|
|||||||
本次已生成并检查 amd64 三类包的元数据与归档,Agent 包解压后的 adsctl 可执行;Avalonia 使用 Windows .NET SDK 发布原生 linux-x64 产物。Linux 桌面图形会话启动、实际 apt 安装/卸载与 arm64 尚未实机验证。校验文件需在输出目录执行 `sha256sum -c SHA256SUMS`。
|
本次已生成并检查 amd64 三类包的元数据与归档,Agent 包解压后的 adsctl 可执行;Avalonia 使用 Windows .NET SDK 发布原生 linux-x64 产物。Linux 桌面图形会话启动、实际 apt 安装/卸载与 arm64 尚未实机验证。校验文件需在输出目录执行 `sha256sum -c SHA256SUMS`。
|
||||||
|
|
||||||
新发布自动递增补丁版本。跨平台同次发布或失败重试使用 `ADS_REUSE_VERSION=1`,并确保外部产物已按当前版本重建。Linux 只生成 deb 安装包与校验文件。
|
新发布自动递增补丁版本。跨平台同次发布或失败重试使用 `ADS_REUSE_VERSION=1`,并确保外部产物已按当前版本重建。Linux 只生成 deb 安装包与校验文件。
|
||||||
|
|
||||||
|
## 安装后的命令入口
|
||||||
|
|
||||||
|
从 0.2.4 起,桌面 deb 安装时自动注册 `/usr/bin/adsctl`、`ads-agent`、`ads-client`、`ads-usb`。命令通过 `/etc/alternatives` 链接到当前提供包的 `/opt/ttstd/ads-*/`,不需要改 PATH。无界面 Agent 包注册它提供的 `adsctl` 和 `ads-agent`。
|
||||||
|
|
||||||
|
```sh
|
||||||
|
sudo apt install ./ads-avalonia_0.2.4_amd64.deb
|
||||||
|
adsctl --help
|
||||||
|
ads-agent --help
|
||||||
|
ads-client --help
|
||||||
|
ads-usb --help
|
||||||
|
```
|
||||||
|
|
||||||
|
多个包可以共存:默认优先级为独立 Agent 80、Avalonia 60、Flutter 50;手动选择可用 `sudo update-alternatives --config adsctl`,重新安装保留手动选择。卸载只撤销该包提供的链接,自动回退其他仍安装的提供者;最后一个提供者移除后清理链接。既有同名普通文件不强制覆盖。
|
||||||
|
|
||||||
|
`deploy/deb-cli-links.sh`(Shell)生成 deb 的 postinst/prerm/postrm 脚本;文件触发器处理旧版 Agent 直接拥有 `/usr/bin/adsctl`、`ads-agent` 时的升级与卸载。不会自动初始化、启动或重启 Agent,不删除用户配置或凭据。
|
||||||
|
|
||||||
|
维护脚本回归:Linux 中以 root 执行 `python3 tests/deb_cli_test.py`。测试在临时 dpkg 根目录安装、升级、移除测试包,守卫拒绝没有 `--root` 的 alternatives 调用,不改宿主 `/usr/bin`。设置 `ADS_DEB_PACKAGE_DIR` 为正式包目录,可额外验证实际 deb 及 CLI 版本(仅隔离测试允许忽略运行库依赖;正常安装请使用 apt)。
|
||||||
@@ -84,3 +84,10 @@ Port cleanup follow-up:
|
|||||||
- 锁定 Semi.Avalonia 11.3.7.3,与当前 Avalonia 11.3.8 兼容。设备、Agent 管理、设置、日志及 Agent 托盘统一使用 Semi 资源;新增 WorkbenchStyles.axaml,替换硬编码深色配色,使用左侧导航和明暗主题开关。
|
- 锁定 Semi.Avalonia 11.3.7.3,与当前 Avalonia 11.3.8 兼容。设备、Agent 管理、设置、日志及 Agent 托盘统一使用 Semi 资源;新增 WorkbenchStyles.axaml,替换硬编码深色配色,使用左侧导航和明暗主题开关。
|
||||||
- 27 项 Avalonia 测试通过,包含中文及 emoji stdout/stderr、流式日志和中文 JSON 输入。离屏渲染四个页面的浅色/深色和 980×700 最小窗口共 10 张 PNG 并检查截图;实际 Windows 发布包 PACKAGE_CHECK_OK,PE 运行库检查通过。
|
- 27 项 Avalonia 测试通过,包含中文及 emoji stdout/stderr、流式日志和中文 JSON 输入。离屏渲染四个页面的浅色/深色和 980×700 最小窗口共 10 张 PNG 并检查截图;实际 Windows 发布包 PACKAGE_CHECK_OK,PE 运行库检查通过。
|
||||||
- Windows 安装器为 0.2.3;Linux 发布同版本 Avalonia/Agent deb。历史乱码日志不改写;安装新版本并重启后,新日志按 UTF-8 正常显示。尚未在本轮执行干净虚拟机完整安装/卸载和 Linux GUI 实机回归。
|
- Windows 安装器为 0.2.3;Linux 发布同版本 Avalonia/Agent deb。历史乱码日志不改写;安装新版本并重启后,新日志按 UTF-8 正常显示。尚未在本轮执行干净虚拟机完整安装/卸载和 Linux GUI 实机回归。
|
||||||
|
|
||||||
|
### 0.2.4:Linux deb 公共 CLI 入口
|
||||||
|
|
||||||
|
- Avalonia 桌面包通过 postinst 注册 `/usr/bin/adsctl`、`ads-agent`、`ads-client`、`ads-usb`,由 update-alternatives 链接至 `/opt/ttstd/ads-avalonia/`;Agent 包为其自带的两个 CLI 注册独立提供者。无直接重复拥有的公共命令文件。
|
||||||
|
- 优先级为 Agent 80、Avalonia 60、Flutter 50;保留手动 alternatives 选择及既有同名普通文件。prerm/postrm 撤销当前包,剩余包自动回退,最后一个提供者移除后清理公共及 alternatives 链接。
|
||||||
|
- 文件触发器处理 0.2.3 旧 Agent 包直接拥有两个 /usr/bin 命令的过渡:升级或移除旧包后,剩余桌面提供者重新注册。不会自动启动/重启 Agent 或删除用户配置。
|
||||||
|
- 6 项隔离 dpkg 生命周期测试通过,覆盖共存、重装、手动选择、桌面切换、旧 Agent 升级/移除、普通文件保护和正式 0.2.4 deb。真实包安装后四个原生工具的 --version 均为 0.2.4,移除 Agent 后均回退桌面路径。测试使用临时根和 alternatives 守卫,不修改宿主 /usr/bin;GUI 依赖在临时根用 force-depends 跳过,真实系统仍应使用 apt 正常解析依赖。
|
||||||
@@ -16,7 +16,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
|
|||||||
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
|
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
|
||||||
# In Windows, build-name is used as the major, minor, and patch parts
|
# In Windows, build-name is used as the major, minor, and patch parts
|
||||||
# of the product and file versions while build-number is used as the build suffix.
|
# of the product and file versions while build-number is used as the build suffix.
|
||||||
version: 0.2.3+4
|
version: 0.2.4+5
|
||||||
|
|
||||||
environment:
|
environment:
|
||||||
sdk: ^3.14.0
|
sdk: ^3.14.0
|
||||||
|
|||||||
@@ -36,9 +36,21 @@ package() {
|
|||||||
for tool in ads-agent ads-client adsctl ads-usb ads-server ads-relay; do
|
for tool in ads-agent ads-client adsctl ads-usb ads-server ads-relay; do
|
||||||
if [[ -f "$payload/$tool" ]]; then check_elf "$payload/$tool"; chmod 755 "$payload/$tool"; fi
|
if [[ -f "$payload/$tool" ]]; then check_elf "$payload/$tool"; chmod 755 "$payload/$tool"; fi
|
||||||
done
|
done
|
||||||
|
if [[ "$kind" != agent ]]; then
|
||||||
printf '#!/bin/sh\nexec /opt/ttstd/%s/%s "$@"\n' "$name" "$exe" > "$tree/usr/bin/$name"
|
printf '#!/bin/sh\nexec /opt/ttstd/%s/%s "$@"\n' "$name" "$exe" > "$tree/usr/bin/$name"
|
||||||
chmod 755 "$tree/usr/bin/$name"
|
chmod 755 "$tree/usr/bin/$name"
|
||||||
if [[ "$kind" == agent ]]; then ln -s /opt/ttstd/ads-agent/adsctl "$tree/usr/bin/adsctl"; fi
|
fi
|
||||||
|
if [[ "$kind" == avalonia || "$kind" == flutter || "$kind" == agent ]]; then
|
||||||
|
case "$kind" in agent) priority=80;; avalonia) priority=60;; flutter) priority=50;; esac
|
||||||
|
for hook in postinst prerm postrm; do
|
||||||
|
sed -e "s/@PACKAGE@/$name/g" -e "s/@PRIORITY@/$priority/g" -e "s/@HOOK@/$hook/g" "$root/deploy/deb-cli-links.sh" > "$tree/DEBIAN/$hook"
|
||||||
|
chmod 755 "$tree/DEBIAN/$hook"
|
||||||
|
done
|
||||||
|
# Old agent packages owned /usr/bin/adsctl and /usr/bin/ads-agent directly.
|
||||||
|
# Re-register after dpkg removes those legacy files during upgrade/removal.
|
||||||
|
printf 'interest-noawait /usr/bin/adsctl\ninterest-noawait /usr/bin/ads-agent\n' > "$tree/DEBIAN/triggers"
|
||||||
|
chmod 644 "$tree/DEBIAN/triggers"
|
||||||
|
fi
|
||||||
if [[ "$kind" == server ]]; then ln -s /opt/ttstd/ads-server/ads-relay "$tree/usr/bin/ads-relay"; fi
|
if [[ "$kind" == server ]]; then ln -s /opt/ttstd/ads-server/ads-relay "$tree/usr/bin/ads-relay"; fi
|
||||||
if [[ "$kind" == avalonia || "$kind" == flutter ]]; then
|
if [[ "$kind" == avalonia || "$kind" == flutter ]]; then
|
||||||
mkdir -p "$tree/usr/share/applications" "$tree/usr/share/icons/hicolor/256x256/apps"
|
mkdir -p "$tree/usr/share/applications" "$tree/usr/share/icons/hicolor/256x256/apps"
|
||||||
|
|||||||
@@ -0,0 +1,153 @@
|
|||||||
|
"""Real dpkg lifecycle tests in disposable roots; run on Linux as root.
|
||||||
|
No host /usr/bin links are changed. A PATH guard rejects unrooted alternatives calls.
|
||||||
|
"""
|
||||||
|
import os
|
||||||
|
from pathlib import Path
|
||||||
|
import subprocess
|
||||||
|
import tempfile
|
||||||
|
import unittest
|
||||||
|
|
||||||
|
REPO = Path(__file__).resolve().parents[1]
|
||||||
|
TOOLS = ('adsctl', 'ads-agent', 'ads-client', 'ads-usb')
|
||||||
|
|
||||||
|
|
||||||
|
class DebCliTests(unittest.TestCase):
|
||||||
|
def setUp(self):
|
||||||
|
self.temp = tempfile.TemporaryDirectory(prefix='ads-deb-test-')
|
||||||
|
self.addCleanup(self.temp.cleanup)
|
||||||
|
self.base = Path(self.temp.name)
|
||||||
|
self.root = self.base / 'root'
|
||||||
|
for path in ('usr/bin', 'etc/alternatives', 'var/lib/dpkg/alternatives', 'var/log'):
|
||||||
|
(self.root / path).mkdir(parents=True, exist_ok=True)
|
||||||
|
(self.root / 'var/lib/dpkg/status').write_text('')
|
||||||
|
guard = self.base / 'guard'
|
||||||
|
guard.mkdir()
|
||||||
|
script = guard / 'update-alternatives'
|
||||||
|
script.write_text('#!/bin/sh\nset -eu\n[ "$1" = --root ] || exit 99\n[ "$2" = "'+str(self.root)+'" ] || exit 99\nexec /usr/bin/update-alternatives "$@"\n')
|
||||||
|
script.chmod(0o755)
|
||||||
|
self.env = dict(os.environ, PATH=str(guard)+':'+os.environ['PATH'])
|
||||||
|
|
||||||
|
def run_command(self, args):
|
||||||
|
result = subprocess.run(args, env=self.env, text=True, capture_output=True)
|
||||||
|
self.assertEqual(result.returncode, 0, f'{args}\n{result.stdout}\n{result.stderr}')
|
||||||
|
return result.stdout
|
||||||
|
|
||||||
|
def package(self, kind, version='0.2.4', legacy=False):
|
||||||
|
name = 'ads-'+kind
|
||||||
|
tree = self.base / (name+'-'+version)
|
||||||
|
control = tree / 'DEBIAN'
|
||||||
|
control.mkdir(parents=True, exist_ok=True)
|
||||||
|
(control / 'control').write_text(f'Package: {name}\nVersion: {version}\nArchitecture: all\nMaintainer: ADS test\nDescription: isolated CLI lifecycle fixture\n')
|
||||||
|
tools = TOOLS if kind != 'agent' else TOOLS[:2]
|
||||||
|
for tool in tools:
|
||||||
|
binary = tree / 'opt/ttstd' / name / tool
|
||||||
|
binary.parent.mkdir(parents=True, exist_ok=True)
|
||||||
|
binary.write_text('#!/bin/sh\necho '+name+' '+version+'\n')
|
||||||
|
binary.chmod(0o755)
|
||||||
|
if legacy:
|
||||||
|
entry = tree / 'usr/bin'
|
||||||
|
entry.mkdir(parents=True)
|
||||||
|
(entry / 'ads-agent').write_text('#!/bin/sh\nexec /opt/ttstd/ads-agent/ads-agent "$@"\n')
|
||||||
|
(entry / 'ads-agent').chmod(0o755)
|
||||||
|
(entry / 'adsctl').symlink_to('/opt/ttstd/ads-agent/adsctl')
|
||||||
|
else:
|
||||||
|
template = (REPO / 'deploy/deb-cli-links.sh').read_text()
|
||||||
|
priority = {'agent':80, 'avalonia':60, 'flutter':50}[kind]
|
||||||
|
for hook in ('postinst', 'prerm', 'postrm'):
|
||||||
|
target = control / hook
|
||||||
|
target.write_text(template.replace('@PACKAGE@',name).replace('@PRIORITY@',str(priority)).replace('@HOOK@',hook))
|
||||||
|
target.chmod(0o755)
|
||||||
|
(control / 'triggers').write_text('interest-noawait /usr/bin/adsctl\ninterest-noawait /usr/bin/ads-agent\n')
|
||||||
|
output = self.base / (name+'-'+version+'.deb')
|
||||||
|
self.run_command(['dpkg-deb','--root-owner-group','--build',str(tree),str(output)])
|
||||||
|
return output
|
||||||
|
|
||||||
|
def dpkg(self, *args):
|
||||||
|
return self.run_command(['dpkg','--root='+str(self.root),'--force-script-chrootless',*map(str,args)])
|
||||||
|
|
||||||
|
def target(self, tool):
|
||||||
|
current = self.root / 'usr/bin' / tool
|
||||||
|
for _ in range(8):
|
||||||
|
if not current.is_symlink():
|
||||||
|
return current if current.is_file() else None
|
||||||
|
link = os.readlink(current)
|
||||||
|
current = self.root / link.lstrip('/') if link.startswith('/') else current.parent / link
|
||||||
|
self.fail('symlink loop: '+tool)
|
||||||
|
|
||||||
|
def assert_provider(self, tool, kind):
|
||||||
|
self.assertEqual(self.target(tool),self.root / 'opt/ttstd' / ('ads-'+kind) / tool)
|
||||||
|
|
||||||
|
def assert_no_entry(self, tool):
|
||||||
|
self.assertFalse(os.path.lexists(self.root / 'usr/bin' / tool), 'Stale public link: '+tool)
|
||||||
|
self.assertFalse(os.path.lexists(self.root / 'etc/alternatives' / tool), 'Stale alternatives link: '+tool)
|
||||||
|
|
||||||
|
def test_desktop_coinstall_manual_choice_and_removal(self):
|
||||||
|
desktop = self.package('avalonia')
|
||||||
|
agent = self.package('agent')
|
||||||
|
self.dpkg('-i',desktop)
|
||||||
|
for tool in TOOLS: self.assert_provider(tool,'avalonia')
|
||||||
|
self.dpkg('-i',desktop) # Reinstallation is idempotent.
|
||||||
|
self.dpkg('-i',agent)
|
||||||
|
self.assert_provider('adsctl','agent')
|
||||||
|
self.assert_provider('ads-client','avalonia')
|
||||||
|
self.run_command(['/usr/bin/update-alternatives','--root',str(self.root),'--set','adsctl','/opt/ttstd/ads-avalonia/adsctl'])
|
||||||
|
self.dpkg('-i',agent)
|
||||||
|
self.assert_provider('adsctl','avalonia') # Preserve manual selection.
|
||||||
|
self.dpkg('-r','ads-avalonia')
|
||||||
|
self.assert_provider('adsctl','agent')
|
||||||
|
self.assert_provider('ads-agent','agent')
|
||||||
|
self.assert_no_entry('ads-client')
|
||||||
|
self.assert_no_entry('ads-usb')
|
||||||
|
self.dpkg('--purge','ads-agent')
|
||||||
|
for tool in TOOLS: self.assert_no_entry(tool)
|
||||||
|
|
||||||
|
def test_legacy_agent_removal_restores_desktop_links(self):
|
||||||
|
self.dpkg('-i',self.package('agent','0.2.3',legacy=True))
|
||||||
|
self.dpkg('-i',self.package('avalonia'))
|
||||||
|
self.dpkg('-r','ads-agent')
|
||||||
|
for tool in TOOLS: self.assert_provider(tool,'avalonia')
|
||||||
|
|
||||||
|
def test_legacy_agent_upgrade_and_fallback(self):
|
||||||
|
self.dpkg('-i',self.package('agent','0.2.3',legacy=True))
|
||||||
|
self.dpkg('-i',self.package('avalonia'))
|
||||||
|
self.dpkg('-i',self.package('agent'))
|
||||||
|
self.assert_provider('adsctl','agent')
|
||||||
|
self.assert_provider('ads-agent','agent')
|
||||||
|
self.dpkg('-r','ads-agent')
|
||||||
|
for tool in TOOLS: self.assert_provider(tool,'avalonia')
|
||||||
|
|
||||||
|
def test_flutter_and_avalonia_link_fallback(self):
|
||||||
|
self.dpkg('-i',self.package('flutter'))
|
||||||
|
self.dpkg('-i',self.package('avalonia'))
|
||||||
|
for tool in TOOLS: self.assert_provider(tool,'avalonia')
|
||||||
|
self.dpkg('--purge','ads-avalonia')
|
||||||
|
for tool in TOOLS: self.assert_provider(tool,'flutter')
|
||||||
|
|
||||||
|
@unittest.skipUnless(os.environ.get('ADS_DEB_PACKAGE_DIR'), 'Real release packages not supplied')
|
||||||
|
def test_real_release_packages(self):
|
||||||
|
folder=Path(os.environ['ADS_DEB_PACKAGE_DIR'])
|
||||||
|
version=os.environ.get('ADS_DEB_VERSION','0.2.4')
|
||||||
|
self.dpkg('--force-depends','-i',folder/f'ads-avalonia_{version}_amd64.deb')
|
||||||
|
for tool in TOOLS:
|
||||||
|
self.assert_provider(tool,'avalonia')
|
||||||
|
self.assertIn(version,self.run_command([str(self.target(tool)),'--version']))
|
||||||
|
self.dpkg('--force-depends','-i',folder/f'ads-agent_{version}_amd64.deb')
|
||||||
|
self.assert_provider('adsctl','agent')
|
||||||
|
self.dpkg('-r','ads-agent')
|
||||||
|
for tool in TOOLS: self.assert_provider(tool,'avalonia')
|
||||||
|
self.dpkg('--purge','ads-avalonia')
|
||||||
|
for tool in TOOLS: self.assert_no_entry(tool)
|
||||||
|
|
||||||
|
def test_existing_real_local_command_is_not_overwritten(self):
|
||||||
|
custom = self.root / 'usr/bin/ads-client'
|
||||||
|
custom.write_text('local custom command')
|
||||||
|
self.dpkg('-i',self.package('avalonia'))
|
||||||
|
self.assertEqual(custom.read_text(),'local custom command')
|
||||||
|
self.dpkg('--purge','ads-avalonia')
|
||||||
|
self.assertEqual(custom.read_text(),'local custom command')
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == '__main__':
|
||||||
|
if os.name != 'posix' or os.geteuid() != 0:
|
||||||
|
raise SystemExit('Run in Linux as root; all dpkg operations use disposable roots')
|
||||||
|
unittest.main(verbosity=2)
|
||||||
Reference in new issue
Block a user