deadcxap/liberama
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Отказ от пакета decompress

Browse Source
This commit is contained in:
Book Pauk
2019-03-01 20:47:55 +07:00
parent cd482ea890
commit db803bcd23
2 changed files with 10 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
build/linux.js
View File

@@ -5,8 +5,7 @@ const stream = require('stream');
const pipeline = util.promisify(stream.pipeline); const pipeline = util.promisify(stream.pipeline);
const got = require('got'); const got = require('got');
const decompress = require('decompress'); const FileDecompressor = require('../server/core/FileDecompressor');
const decompressTargz = require('decompress-targz');
const distDir = path.resolve(__dirname, '../dist'); const distDir = path.resolve(__dirname, '../dist');
const publicDir = `${distDir}/tmp/public`; const publicDir = `${distDir}/tmp/public`;
@@ -15,6 +14,8 @@ const outDir = `${distDir}/linux`;
const tempDownloadDir = `${distDir}/tmp/download`; const tempDownloadDir = `${distDir}/tmp/download`;
async function main() { async function main() {
const decomp = new FileDecompressor();
await fs.emptyDir(outDir); await fs.emptyDir(outDir);
// перемещаем public на место // перемещаем public на место
if (await fs.pathExists(publicDir)) if (await fs.pathExists(publicDir))
@@ -32,11 +33,7 @@ async function main() {
console.log(`done downloading ${sqliteRemoteUrl}`); console.log(`done downloading ${sqliteRemoteUrl}`);
//распаковываем //распаковываем
await decompress(`${tempDownloadDir}/sqlite.tar.gz`, `${tempDownloadDir}`, { console.log(await decomp.unpackTarZZ(`${tempDownloadDir}/sqlite.tar.gz`, tempDownloadDir));
plugins: [
decompressTargz()
]
});
console.log('files decompressed'); console.log('files decompressed');
} }
// копируем в дистрибутив // копируем в дистрибутив
@@ -53,11 +50,7 @@ async function main() {
console.log(`done downloading ${ipfsRemoteUrl}`); console.log(`done downloading ${ipfsRemoteUrl}`);
//распаковываем //распаковываем
await decompress(`${tempDownloadDir}/ipfs.tar.gz`, `${tempDownloadDir}`, { console.log(await decomp.unpackTarZZ(`${tempDownloadDir}/ipfs.tar.gz`, tempDownloadDir));
plugins: [
decompressTargz()
]
});
console.log('files decompressed'); console.log('files decompressed');
} }

13
build/win.js
View File

@@ -5,8 +5,7 @@ const stream = require('stream');
const pipeline = util.promisify(stream.pipeline); const pipeline = util.promisify(stream.pipeline);
const got = require('got'); const got = require('got');
const decompress = require('decompress'); const FileDecompressor = require('../server/core/FileDecompressor');
const decompressTargz = require('decompress-targz');
const distDir = path.resolve(__dirname, '../dist'); const distDir = path.resolve(__dirname, '../dist');
const publicDir = `${distDir}/tmp/public`; const publicDir = `${distDir}/tmp/public`;
@@ -15,6 +14,8 @@ const outDir = `${distDir}/win`;
const tempDownloadDir = `${distDir}/tmp/download`; const tempDownloadDir = `${distDir}/tmp/download`;
async function main() { async function main() {
const decomp = new FileDecompressor();
await fs.emptyDir(outDir); await fs.emptyDir(outDir);
// перемещаем public на место // перемещаем public на место
if (await fs.pathExists(publicDir)) if (await fs.pathExists(publicDir))
@@ -32,11 +33,7 @@ async function main() {
console.log(`done downloading ${sqliteRemoteUrl}`); console.log(`done downloading ${sqliteRemoteUrl}`);
//распаковываем //распаковываем
await decompress(`${tempDownloadDir}/sqlite.tar.gz`, `${tempDownloadDir}`, { console.log(await decomp.unpackTarZZ(`${tempDownloadDir}/sqlite.tar.gz`, tempDownloadDir));
plugins: [
decompressTargz()
]
});
console.log('files decompressed'); console.log('files decompressed');
} }
// копируем в дистрибутив // копируем в дистрибутив
@@ -53,7 +50,7 @@ async function main() {
console.log(`done downloading ${ipfsRemoteUrl}`); console.log(`done downloading ${ipfsRemoteUrl}`);
//распаковываем //распаковываем
await decompress(`${tempDownloadDir}/ipfs.zip`, `${tempDownloadDir}`); console.log(await decomp.unpack(`${tempDownloadDir}/ipfs.zip`, tempDownloadDir));
console.log('files decompressed'); console.log('files decompressed');
} }
// копируем в дистрибутив // копируем в дистрибутив