pacman-debian 7.3.34 → 7.4.0

package/dist/makepkg/pkgbuild.js

@@ -39,76 +39,128 @@ exports.printSrcinfo = printSrcinfo;
 const node_child_process_1 = require("node:child_process");
 const fs = __importStar(require("node:fs"));
 const path = __importStar(require("node:path"));
-function bashGet(v, p) {
-    try {
-        return (0, node_child_process_1.execSync)(`bash -c 'source "${p}" 2>/dev/null; printf "%s" "${'$'}{${v}}" 2>/dev/null'`, { encoding: 'utf8', timeout: 10000 }).trim();
-    }
-    catch {
-        return '';
-    }
-}
-function bashGetArray(v, p) {
-    try {
-        const out = (0, node_child_process_1.execSync)(`bash -c 'source "${p}" 2>/dev/null; for i in "${'$'}{${v}[@]}"; do echo "$i"; done' 2>/dev/null`, { encoding: 'utf8', timeout: 10000 }).trim();
-        return out ? out.split('\n').filter(Boolean) : [];
-    }
-    catch {
-        return [];
-    }
-}
-function bashGetFn(f, p) {
-    try {
-        return (0, node_child_process_1.execSync)(`bash -c 'source "${p}" 2>/dev/null; declare -f ${f} 2>/dev/null'`, { encoding: 'utf8', timeout: 10000 }).trim();
-    }
-    catch {
-        return '';
+/**
+ * Source the PKGBUILD ONCE in a single bash invocation and extract all
+ * variables + functions. Previously each variable/function required a
+ * separate execSync (≈35 forks), which was very slow on low-end ARM boards.
+ */
+function bashParsePkgbuild(absPath) {
+    const script = [
+        `source "${absPath}" 2>/dev/null`,
+        'echo "S pkgbase=${pkgbase-unset}"',
+        'echo "S pkgname=${pkgname-unset}"',
+        'echo "S pkgver=${pkgver-unset}"',
+        'echo "S pkgrel=${pkgrel-unset}"',
+        'echo "S epoch=${epoch-unset}"',
+        'echo "S pkgdesc=${pkgdesc-unset}"',
+        'echo "S url=${url-unset}"',
+        'echo "S install=${install-unset}"',
+        'for i in "${arch[@]+"${arch[@]}"}"; do printf "A arch=%s\\n" "$i"; done',
+        'for i in "${license[@]+"${license[@]}"}"; do printf "A license=%s\\n" "$i"; done',
+        'for i in "${groups[@]+"${groups[@]}"}"; do printf "A groups=%s\\n" "$i"; done',
+        'for i in "${depends[@]+"${depends[@]}"}"; do printf "A depends=%s\\n" "$i"; done',
+        'for i in "${makedepends[@]+"${makedepends[@]}"}"; do printf "A makedepends=%s\\n" "$i"; done',
+        'for i in "${optdepends[@]+"${optdepends[@]}"}"; do printf "A optdepends=%s\\n" "$i"; done',
+        'for i in "${checkdepends[@]+"${checkdepends[@]}"}"; do printf "A checkdepends=%s\\n" "$i"; done',
+        'for i in "${provides[@]+"${provides[@]}"}"; do printf "A provides=%s\\n" "$i"; done',
+        'for i in "${conflicts[@]+"${conflicts[@]}"}"; do printf "A conflicts=%s\\n" "$i"; done',
+        'for i in "${replaces[@]+"${replaces[@]}"}"; do printf "A replaces=%s\\n" "$i"; done',
+        'for i in "${source[@]+"${source[@]}"}"; do printf "A source=%s\\n" "$i"; done',
+        'for i in "${noextract[@]+"${noextract[@]}"}"; do printf "A noextract=%s\\n" "$i"; done',
+        'for i in "${sha256sums[@]+"${sha256sums[@]}"}"; do printf "A sha256sums=%s\\n" "$i"; done',
+        'for i in "${md5sums[@]+"${md5sums[@]}"}"; do printf "A md5sums=%s\\n" "$i"; done',
+        'for i in "${validpgpkeys[@]+"${validpgpkeys[@]}"}"; do printf "A validpgpkeys=%s\\n" "$i"; done',
+        'for i in "${options[@]+"${options[@]}"}"; do printf "A options=%s\\n" "$i"; done',
+        'for i in "${backup[@]+"${backup[@]}"}"; do printf "A backup=%s\\n" "$i"; done',
+        'for f in build package prepare check; do',
+        '  echo "F $f"',
+        '  declare -f "$f" 2>/dev/null || true',
+        '  echo "E $f"',
+        'done',
+    ].join('\n');
+    const out = (0, node_child_process_1.execSync)('bash -s', { input: script, encoding: 'utf8', timeout: 10000 }).trim();
+    const lines = out.split('\n');
+    const scalars = {};
+    const arrays = {};
+    const funcs = {};
+    let currentFunc = null;
+    let funcBuffer = [];
+    for (const line of lines) {
+        if (line.startsWith('S ')) {
+            const val = line.substring(2);
+            const eqIdx = val.indexOf('=');
+            if (eqIdx > 0) {
+                const value = val.substring(eqIdx + 1);
+                if (value !== 'unset')
+                    scalars[val.substring(0, eqIdx)] = value;
+            }
+        }
+        else if (line.startsWith('A ')) {
+            const val = line.substring(2);
+            const eqIdx = val.indexOf('=');
+            if (eqIdx > 0) {
+                const key = val.substring(0, eqIdx);
+                const value = val.substring(eqIdx + 1);
+                (arrays[key] || (arrays[key] = [])).push(value);
+            }
+        }
+        else if (line.startsWith('F ')) {
+            currentFunc = line.substring(2);
+            funcBuffer = [];
+        }
+        else if (line.startsWith('E ') && currentFunc !== null && line.substring(2) === currentFunc) {
+            if (funcBuffer.length > 0)
+                funcs[currentFunc] = funcBuffer.join('\n');
+            currentFunc = null;
+            funcBuffer = [];
+        }
+        else if (currentFunc !== null) {
+            funcBuffer.push(line);
+        }
     }
+    return { scalars, arrays, funcs };
 }
-function parsePkgbuild(pkgbuildPath, ignoreArch = false) {
+function parsePkgbuild(pkgbuildPath, _ignoreArch = false) {
     if (!fs.existsSync(pkgbuildPath))
         throw new Error(`PKGBUILD not found: ${pkgbuildPath}`);
     const absPath = path.resolve(pkgbuildPath);
-    const arch = bashGetArray('arch', absPath);
-    const systemArch = process.arch === 'arm64' ? 'aarch64' : process.arch;
-    const validArch = ignoreArch || arch.length === 0 || arch.includes('any') || arch.includes(systemArch);
+    const { scalars, arrays, funcs } = bashParsePkgbuild(absPath);
     const info = {
-        pkgbase: bashGet('pkgbase', absPath) || undefined,
-        pkgname: bashGet('pkgname', absPath),
-        pkgver: bashGet('pkgver', absPath),
-        pkgrel: bashGet('pkgrel', absPath),
-        epoch: bashGet('epoch', absPath) || undefined,
-        pkgdesc: bashGet('pkgdesc', absPath) || '',
-        arch,
-        url: bashGet('url', absPath) || undefined,
-        license: bashGetArray('license', absPath),
-        groups: bashGetArray('groups', absPath),
-        depends: bashGetArray('depends', absPath),
-        makedepends: bashGetArray('makedepends', absPath),
-        optdepends: bashGetArray('optdepends', absPath),
-        checkdepends: bashGetArray('checkdepends', absPath),
-        provides: bashGetArray('provides', absPath),
-        conflicts: bashGetArray('conflicts', absPath),
-        replaces: bashGetArray('replaces', absPath),
-        source: bashGetArray('source', absPath),
-        noextract: bashGetArray('noextract', absPath),
-        sha256sums: bashGetArray('sha256sums', absPath),
-        md5sums: bashGetArray('md5sums', absPath),
-        validpgpkeys: bashGetArray('validpgpkeys', absPath),
-        install: bashGet('install', absPath) || undefined,
-        options: bashGetArray('options', absPath),
-        backup: bashGetArray('backup', absPath),
-        buildFn: bashGetFn('build', absPath),
-        packageFn: bashGetFn('package', absPath),
-        prepareFn: bashGetFn('prepare', absPath),
-        checkFn: bashGetFn('check', absPath),
-        validArch,
+        pkgbase: scalars['pkgbase'] || undefined,
+        pkgname: scalars['pkgname'] || '',
+        pkgver: scalars['pkgver'] || '',
+        pkgrel: scalars['pkgrel'] || '',
+        epoch: scalars['epoch'] || undefined,
+        pkgdesc: scalars['pkgdesc'] || '',
+        arch: arrays['arch'] || [],
+        url: scalars['url'] || undefined,
+        license: arrays['license'] || [],
+        groups: arrays['groups'] || [],
+        depends: arrays['depends'] || [],
+        makedepends: arrays['makedepends'] || [],
+        optdepends: arrays['optdepends'] || [],
+        checkdepends: arrays['checkdepends'] || [],
+        provides: arrays['provides'] || [],
+        conflicts: arrays['conflicts'] || [],
+        replaces: arrays['replaces'] || [],
+        source: arrays['source'] || [],
+        noextract: arrays['noextract'] || [],
+        sha256sums: arrays['sha256sums'] || [],
+        md5sums: arrays['md5sums'] || [],
+        validpgpkeys: arrays['validpgpkeys'] || [],
+        install: scalars['install'] || undefined,
+        options: arrays['options'] || [],
+        backup: arrays['backup'] || [],
+        buildFn: funcs['build'] || '',
+        packageFn: funcs['package'] || '',
+        prepareFn: funcs['prepare'] || '',
+        checkFn: funcs['check'] || '',
+        validArch: true,
     };
     if (!info.pkgname)
         throw new Error('PKGBUILD missing pkgname');
     if (!info.pkgver)
         throw new Error('PKGBUILD missing pkgver');
-    if (!info.validArch)
-        throw new Error(`PKGBUILD does not support architecture: ${systemArch} (${arch.join(', ')})`);
     return info;
 }
 function pkgFilename(info, archOverride) {

package/dist/makepkg/pkgbuild.js.map

@@ -1 +1 @@
-{"version":3,"file":"pkgbuild.js","sourceRoot":"","sources":["../../src/makepkg/pkgbuild.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"pkgbuild.js","sourceRoot":"","sources":["../../src/makepkg/pkgbuild.ts"],"names":[],"mappings":"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"}

package/dist/ops/install.d.ts

@@ -1,5 +1,6 @@
+import type { ProgressCallback } from '../core/tar';
 import type { InstallOptions } from '../core/options';
-export declare function installPkgFile(filePath: string, reason: 'explicit' | 'dependency', opts?: InstallOptions): Promise<boolean>;
+export declare function installPkgFile(filePath: string, reason: 'explicit' | 'dependency', opts?: InstallOptions, onProgress?: ProgressCallback): Promise<boolean>;
 export declare function installPkg(target: string, opts?: InstallOptions): Promise<boolean>;
 export declare function installPackages(targets: string[], opts?: InstallOptions): Promise<number>;
 //# sourceMappingURL=install.d.ts.map

package/dist/ops/install.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"install.d.ts","sourceRoot":"","sources":["../../src/ops/install.ts"],"names":[],"mappings":"AAuBA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AA4ItD,wBAAsB,cAAc,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,GAAG,YAAY,EAAE,IAAI,GAAE,cAAmB,GAAG,OAAO,CAAC,OAAO,CAAC,CAMrI;AA8GD,wBAAsB,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,GAAE,cAAmB,GAAG,OAAO,CAAC,OAAO,CAAC,CAgD5F;AAED,wBAAsB,eAAe,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,IAAI,GAAE,cAAmB,GAAG,OAAO,CAAC,MAAM,CAAC,CAmOnG"}
+{"version":3,"file":"install.d.ts","sourceRoot":"","sources":["../../src/ops/install.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAiBpD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAwJtD,wBAAsB,cAAc,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,GAAG,YAAY,EAAE,IAAI,GAAE,cAAmB,EAAE,UAAU,CAAC,EAAE,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC,CAMpK;AA8GD,wBAAsB,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,GAAE,cAAmB,GAAG,OAAO,CAAC,OAAO,CAAC,CAmD5F;AAED,wBAAsB,eAAe,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,IAAI,GAAE,cAAmB,GAAG,OAAO,CAAC,MAAM,CAAC,CAqQnG"}

package/dist/ops/install.js

@@ -55,13 +55,14 @@ const format_1 = require("../ui/format");
 const progress_1 = require("../ui/progress");
 const prompt_1 = require("../ui/prompt");
 const i18n_1 = require("../i18n");
-async function installDeb(filePath, reason, opts = {}) {
+async function installDeb(filePath, reason, opts = {}, onProgress) {
     (0, database_1.initDb)();
     const pkg = (0, deb_1.parseDeb)(filePath);
     const db = (0, database_1.loadDatabase)();
     removeLinkIfPresent(pkg.control.package);
     const { control } = pkg;
     const existing = (0, database_1.getPackage)(db, control.package);
+    const _cfg = (0, config_1.loadConfig)();
     if (opts.needed && existing && existing.version === control.version) {
         return false;
     }
@@ -82,7 +83,7 @@ async function installDeb(filePath, reason, opts = {}) {
             (0, database_1.saveScript)(control.package, 'preinst', preinst);
         (0, database_1.runScript)(control.package, 'preinst', ['install']);
     }
-    const files = (0, tar_1.extractTar)(pkg.dataTar, '/');
+    const files = (0, tar_1.extractTar)(pkg.dataTar, '/', onProgress, _cfg.noExtract, _cfg.noUpgrade);
     if (!opts.noscriptlet) {
         const postinst = (0, deb_1.readScript)(pkg, 'postinst');
         if (postinst)
@@ -128,7 +129,7 @@ function removeLinkIfPresent(pkgName) {
         (0, localdb_1.removePackage)(pkgName, existing.version);
     }
 }
-async function installArch(filePath, reason, opts = {}) {
+async function installArch(filePath, reason, opts = {}, onProgress) {
     (0, database_1.initDb)();
     const data = fs.readFileSync(filePath);
     const { info, install, files: pkgFiles, dataBlocks } = (0, pkgfile_1.parsePkgTarZst)(data);
@@ -161,15 +162,28 @@ async function installArch(filePath, reason, opts = {}) {
         }
     }
     const files = [];
-    for (const entry of dataBlocks) {
+    const total = dataBlocks.length;
+    const _archCfg = (0, config_1.loadConfig)();
+    const matchArch = (p, name) => p === name || p === '/' + name || (p.endsWith('/*') && name.startsWith(p.slice(0, -1)));
+    for (let i = 0; i < total; i++) {
+        const entry = dataBlocks[i];
         const targetPath = path.resolve('/', entry.name);
         if (!targetPath.startsWith('/'))
             continue;
         files.push('/' + entry.name);
+        if (_archCfg.noExtract.some(p => matchArch(p, entry.name)))
+            continue;
         if (entry.data) {
             fs.mkdirSync(path.dirname(targetPath), { recursive: true });
-            fs.writeFileSync(targetPath, entry.data, { mode: 0o755 });
+            if (_archCfg.noUpgrade.some(p => matchArch(p, entry.name)) && fs.existsSync(targetPath)) {
+                const bak = targetPath + '.pacnew';
+                fs.writeFileSync(bak, entry.data, { mode: 0o755 });
+            }
+            else {
+                fs.writeFileSync(targetPath, entry.data, { mode: 0o755 });
+            }
         }
+        onProgress?.(i + 1, total, entry.name);
     }
     if (!opts.noscriptlet && install?.post_install) {
         const tmpScript = `/var/lib/pacman-debian/info/${info.name}/.INSTALL`;
@@ -212,15 +226,15 @@ async function installArch(filePath, reason, opts = {}) {
     (0, database_1.completeTransaction)(tx.id);
     return true;
 }
-async function installPkgFile(filePath, reason, opts = {}) {
+async function installPkgFile(filePath, reason, opts = {}, onProgress) {
     if (opts.print) {
         console.log((0, i18n_1.t)('would_install', path.basename(filePath)));
         return true;
     }
     if (filePath.endsWith('.pkg.tar.zst') || filePath.endsWith('.pkg.tar.xz') || filePath.endsWith('.pkg.tar.gz')) {
-        return installArch(filePath, reason, opts);
+        return installArch(filePath, reason, opts, onProgress);
     }
-    return installDeb(filePath, reason, opts);
+    return installDeb(filePath, reason, opts, onProgress);
 }
 function parseFtpUrl(url) {
     const rest = url.slice(6);
@@ -383,8 +397,11 @@ async function installPkg(target, opts = {}) {
         return false;
     }
     const cols = process.stdout.columns || 80;
-    const barLen = Math.max(Math.floor((cols - 30) * 0.35), 8);
-    const barDone = '#'.repeat(barLen);
+    const barLen = Math.max(cols - 50, 8);
+    const drawBar = (pct) => {
+        const filled = Math.round((pct / 100) * barLen);
+        return `[${'#'.repeat(filled)}${'-'.repeat(barLen - filled)}] ${String(pct).padStart(3)}%`;
+    };
     console.log((0, i18n_1.t)('packages_single', fname) + '\n');
     if (!await (0, prompt_1.confirm)((0, i18n_1.t)('confirm_proceed')))
         return false;
@@ -392,9 +409,9 @@ async function installPkg(target, opts = {}) {
         console.log((0, i18n_1.t)('would_install', fname));
         return true;
     }
-    process.stdout.write((0, i18n_1.t)('progress_loading_data', '1', '1', barDone) + '\n');
-    process.stdout.write((0, i18n_1.t)('progress_installing_single', '1', '1', fname, barDone) + '\n');
+    console.log(`(1/1) ${(0, i18n_1.t)('progress_loading_files_msg')} ${drawBar(0)}`);
     const result = await installPkgFile(localPath, 'explicit', opts);
+    console.log(`(1/1) installing ${fname} ${drawBar(100)}`);
     if (isUrl)
         try {
             fs.unlinkSync(localPath);
@@ -460,7 +477,25 @@ async function installPackages(targets, opts = {}) {
     }
     const totalSize = allPkgs.reduce((s, p) => s + (p.size || 0), 0);
     const totalInst = allPkgs.reduce((s, p) => s + ((p.installedSize || 0) * 1024), 0);
-    console.log((0, i18n_1.t)('packages_multi', String(allPkgs.length), allPkgs.map(p => p.package).join('  ')) + '\n');
+    const _cfg = (0, config_1.loadConfig)();
+    if (_cfg.verbosePkgLists) {
+        const cols = process.stdout.columns || 80;
+        const nameW = Math.max(20, Math.floor(cols * 0.3));
+        const verW = Math.max(16, Math.floor(cols * 0.2));
+        const repoW = Math.max(10, Math.floor(cols * 0.15));
+        console.log((0, i18n_1.t)('packages_multi', String(allPkgs.length), ''));
+        console.log(`  ${'Name'.padEnd(nameW)} ${'Version'.padEnd(verW)} ${'Repo'.padEnd(repoW)} Size`);
+        console.log(`  ${'─'.repeat(nameW)} ${'─'.repeat(verW)} ${'─'.repeat(repoW)} ${'─'.repeat(8)}`);
+        for (const p of allPkgs) {
+            const name = p.package.length > nameW ? p.package.slice(0, nameW - 3) + '...' : p.package;
+            const ver = (p.version || '').length > verW ? (p.version || '').slice(0, verW - 3) + '...' : (p.version || '');
+            console.log(`  ${name.padEnd(nameW)} ${ver.padEnd(verW)} ${p.repo.padEnd(repoW)} ${(0, format_1.formatBytes)(p.size || 0).padStart(8)}`);
+        }
+    }
+    else {
+        console.log((0, i18n_1.t)('packages_multi', String(allPkgs.length), allPkgs.map(p => p.package).join('  ')));
+    }
+    console.log('');
     console.log((0, i18n_1.t)('total_download_size', (0, format_1.formatBytes)(totalSize).padStart(9)));
     console.log((0, i18n_1.t)('total_installed_size', (0, format_1.formatBytes)(totalInst).padStart(9)));
     console.log('');
@@ -471,20 +506,29 @@ async function installPackages(targets, opts = {}) {
             console.log((0, i18n_1.t)('would_install', `${p.package}-${p.version}`));
         return allPkgs.length;
     }
+    // ---- Transaction start ----
+    console.log((0, i18n_1.t)('processing_changes'));
     // ---- Download phase ----
     const total = allPkgs.length;
     const cols = process.stdout.columns || 80;
     const parallelN = (0, config_1.loadConfig)().parallelDownloads || 1;
-    console.log((0, i18n_1.t)('downloading_packages'));
+    console.log((0, i18n_1.t)('retrieving_packages'));
     const downloaded = [];
     const startTime = Date.now();
     /** Render a right-aligned progress bar line. leftText precedes `[`, rightText follows `]`. */
     const barLine = (leftText, rightText, pct) => {
         const barLen = Math.max(cols - (0, progress_1.terminalWidth)(leftText) - (0, progress_1.terminalWidth)(rightText), 5);
-        return `${leftText}${(0, progress_1.drawProgressBar)(pct, barLen)}${rightText}`;
+        const line = `${leftText}${(0, progress_1.drawProgressBar)(pct, barLen)}${rightText}`;
+        if ((0, progress_1.terminalWidth)(line) < cols)
+            return line + ' '.repeat(cols - (0, progress_1.terminalWidth)(line));
+        return line;
     };
     const nameWidth = Math.max(25, Math.floor(cols * 0.35));
+    let dlIdx = 0;
     const downloadOne = async (p) => {
+        const idx = ++dlIdx;
+        const digits = String(total).length;
+        const prefix = `(${String(idx).padStart(digits)}/${String(total).padEnd(digits)})`;
         const pkgLabel = `${p.package}-${p.version}-${p.architecture || 'any'}`;
         const displayName = pkgLabel.length > nameWidth ? pkgLabel.slice(0, nameWidth - 3) + '...' : pkgLabel;
         let finalRate = 0, prevTime = Date.now(), prevBytes = 0, smoothRate = 0;
@@ -501,12 +545,12 @@ async function installPackages(targets, opts = {}) {
             const eta = smoothRate > 0 && tot > 0 ? (tot - rec) / smoothRate : 0;
             const etaS = (0, progress_1.formatETA)(eta);
             const pct = tot > 0 ? Math.round(rec / tot * 100) : 0;
-            const line = barLine(`\r ${displayName.padEnd(nameWidth)} ${dl.val.padStart(6)} ${dl.unit.padEnd(3)}  ${rateStr} ${etaS}  [`, `] ${String(pct).padStart(3)}%`, pct);
-            process.stdout.write(line);
+            const line = barLine(` ${prefix} ${displayName.padEnd(nameWidth)} ${dl.val.padStart(6)} ${dl.unit.padEnd(3)}  ${rateStr} ${etaS}  [`, `] ${String(pct).padStart(3)}%`, pct);
+            process.stdout.write(`\r${line}`);
         });
         const finalSize = (0, progress_1.humanSize)(p.size || 0, 1);
-        const compLine = barLine(`\r ${displayName.padEnd(nameWidth)} ${finalSize.val.padStart(6)} ${finalSize.unit.padEnd(3)}  ${(0, progress_1.formatRate)(finalRate)} ${'00:00'}  [`, `] 100%`, 100);
-        process.stdout.write(compLine + '\n');
+        const compLine = barLine(` ${prefix} ${displayName.padEnd(nameWidth)} ${finalSize.val.padStart(6)} ${finalSize.unit.padEnd(3)}  ${(0, progress_1.formatRate)(finalRate)} ${'00:00'}  [`, `] 100%`, 100);
+        process.stdout.write(`\r${compLine}\n`);
         return { pkg: p, path: localPath, rate: finalRate };
     };
     // Parallel download
@@ -530,7 +574,10 @@ async function installPackages(targets, opts = {}) {
     const totalLine = barLine(` ${totalLabel.padEnd(nameWidth)} ${totalSizeStr.val.padStart(6)} ${totalSizeStr.unit.padEnd(3)}  ${totalRateStr} ${'00:00'}  [`, `] 100%`, 100);
     process.stdout.write(totalLine + '\n');
     // ---- Pre-install checks (after download, matching real pacman order) ----
-    const prefixStr = `(${String(total)}/${String(total)}) `;
+    const totalChk = downloaded.length;
+    const digitsChk = String(totalChk).length;
+    let chkIdx = 0;
+    const prefixChk = () => `(${String(++chkIdx).padStart(digitsChk)}/${String(totalChk).padEnd(digitsChk)})`;
     const checkMessages = [
         (0, i18n_1.t)('progress_checking_keys_msg'),
         (0, i18n_1.t)('progress_checking_integrity_msg'),
@@ -538,10 +585,11 @@ async function installPackages(targets, opts = {}) {
         (0, i18n_1.t)('progress_checking_conflicts_msg'),
         (0, i18n_1.t)('progress_checking_space_msg'),
     ];
-    const maxMsgTw = Math.max(...checkMessages.map(m => (0, progress_1.terminalWidth)(m)));
+    const maxChkMsgTw = Math.max(...checkMessages.map(m => (0, progress_1.terminalWidth)(m)));
     const fmtCheck = (msg) => {
-        const pad = maxMsgTw - (0, progress_1.terminalWidth)(msg);
-        const line = barLine(`${prefixStr}${msg}${' '.repeat(pad)} [`, `] 100%`, 100);
+        const p = prefixChk();
+        const pad = maxChkMsgTw - (0, progress_1.terminalWidth)(msg);
+        const line = barLine(` ${p} ${msg}${' '.repeat(pad)} [`, `] 100%`, 100);
         process.stdout.write(line + '\n');
     };
     // 1. Keys check
@@ -561,8 +609,9 @@ async function installPackages(targets, opts = {}) {
     // 3. Load files — validate package archive format
     for (const { pkg: p, path: fp } of downloaded) {
         try {
-            if (fp.endsWith('.deb'))
-                (0, node_child_process_1.execSync)(`dpkg-deb --info "${fp}" 2>/dev/null`, { encoding: 'utf8', timeout: 5000 });
+            if (fp.endsWith('.deb')) {
+                (0, deb_1.parseDeb)(fp);
+            }
             else
                 (0, node_child_process_1.execSync)(`tar -t --zstd -f "${fp}" 2>/dev/null | head -1`, { encoding: 'utf8', timeout: 5000 });
         }
@@ -575,19 +624,23 @@ async function installPackages(targets, opts = {}) {
     // 4. File conflict check
     fmtCheck((0, i18n_1.t)('progress_checking_conflicts_msg'));
     // 5. Available space check
-    try {
-        const df = (0, node_child_process_1.execSync)('df -k /', { encoding: 'utf8', timeout: 5000 });
-        const match = df.trim().split('\n').pop()?.match(/\s(\d+)\s+(\d+)\s+(\d+)/);
-        if (match) {
-            const availKb = parseInt(match[3], 10);
-            const needKb = Math.ceil((allPkgs.reduce((s, p) => s + ((p.installedSize || 0) * 1024), 0)) / 1024);
-            if (availKb < needKb) {
-                console.error(`\n  ERROR: not enough disk space (need ${needKb} KiB, have ${availKb} KiB)`);
-                return 0;
+    const cfg = (0, config_1.loadConfig)();
+    if (cfg.checkSpace) {
+        try {
+            const dfPath = cfg.rootDir === '/' ? '/' : cfg.rootDir;
+            const df = (0, node_child_process_1.execSync)(`df -k "${dfPath}"`, { encoding: 'utf8', timeout: 5000 });
+            const match = df.trim().split('\n').pop()?.match(/\s(\d+)\s+(\d+)\s+(\d+)/);
+            if (match) {
+                const availKb = parseInt(match[3], 10);
+                const needKb = allPkgs.reduce((s, p) => s + ((p.installedSize || 0)), 0);
+                if (availKb < needKb) {
+                    console.error(`\n  error: not enough disk space (need ${(needKb / 1024).toFixed(1)} MiB, have ${(availKb / 1024).toFixed(1)} MiB)`);
+                    return 0;
+                }
             }
         }
+        catch { }
     }
-    catch { }
     fmtCheck((0, i18n_1.t)('progress_checking_space_msg'));
     // Install phase (serial for safety)
     for (const { pkg: p, path: localPath } of downloaded) {