diff options
Diffstat (limited to 'scripts')
-rwxr-xr-x | scripts/build/client.sh | 5 | ||||
-rwxr-xr-x | scripts/ci.sh | 2 | ||||
-rwxr-xr-x | scripts/e2e/index.sh | 2 | ||||
-rwxr-xr-x | scripts/e2e/local.sh | 2 | ||||
-rw-r--r-- | scripts/optimize-old-videos.ts | 2 | ||||
-rw-r--r-- | scripts/print-transcode-command.ts | 2 | ||||
-rwxr-xr-x | scripts/prune-storage.ts | 2 | ||||
-rwxr-xr-x | scripts/reset-password.ts | 2 | ||||
-rwxr-xr-x | scripts/update-host.ts | 4 |
9 files changed, 12 insertions, 11 deletions
diff --git a/scripts/build/client.sh b/scripts/build/client.sh index aec138653..91147fc51 100755 --- a/scripts/build/client.sh +++ b/scripts/build/client.sh | |||
@@ -49,7 +49,7 @@ if [ -z ${1+x} ] || ([ "$1" != "--light" ] && [ "$1" != "--analyze-bundle" ]); t | |||
49 | additionalParams="--sourceMap=true" | 49 | additionalParams="--sourceMap=true" |
50 | fi | 50 | fi |
51 | 51 | ||
52 | npm run ng build -- --prod --output-path "dist/build" $additionalParams | 52 | npm run ng build -- --configuration production --output-path "dist/build" $additionalParams |
53 | 53 | ||
54 | for key in "${!languages[@]}"; do | 54 | for key in "${!languages[@]}"; do |
55 | lang=${languages[$key]} | 55 | lang=${languages[$key]} |
@@ -72,7 +72,8 @@ else | |||
72 | export ANALYZE_BUNDLE=true | 72 | export ANALYZE_BUNDLE=true |
73 | fi | 73 | fi |
74 | 74 | ||
75 | npm run ng build -- --localize=false --output-path "dist/$defaultLanguage/" --deploy-url "/client/$defaultLanguage/" --prod --stats-json $additionalParams | 75 | npm run ng build -- --localize=false --output-path "dist/$defaultLanguage/" \ |
76 | --deploy-url "/client/$defaultLanguage/" --configuration production --stats-json $additionalParams | ||
76 | fi | 77 | fi |
77 | 78 | ||
78 | cp "./dist/$defaultLanguage/manifest.webmanifest" "./dist/manifest.webmanifest" | 79 | cp "./dist/$defaultLanguage/manifest.webmanifest" "./dist/manifest.webmanifest" |
diff --git a/scripts/ci.sh b/scripts/ci.sh index a0de62d91..f4a200a00 100755 --- a/scripts/ci.sh +++ b/scripts/ci.sh | |||
@@ -44,7 +44,7 @@ if [ "$1" = "misc" ]; then | |||
44 | pluginsFiles=$(findTestFiles server/tests/plugins) | 44 | pluginsFiles=$(findTestFiles server/tests/plugins) |
45 | miscFiles="server/tests/client.ts server/tests/misc-endpoints.ts" | 45 | miscFiles="server/tests/client.ts server/tests/misc-endpoints.ts" |
46 | 46 | ||
47 | TS_NODE_FILES=true runTest "$1" 1 $feedsFiles $helperFiles $pluginsFiles $miscFiles | 47 | MOCHA_PARALLEL=true TS_NODE_FILES=true runTest "$1" 2 $feedsFiles $helperFiles $pluginsFiles $miscFiles |
48 | elif [ "$1" = "cli" ]; then | 48 | elif [ "$1" = "cli" ]; then |
49 | npm run build:server | 49 | npm run build:server |
50 | npm run setup:cli | 50 | npm run setup:cli |
diff --git a/scripts/e2e/index.sh b/scripts/e2e/index.sh index 08f09c9ed..49d57f1df 100755 --- a/scripts/e2e/index.sh +++ b/scripts/e2e/index.sh | |||
@@ -11,4 +11,4 @@ npm run clean:server:test | |||
11 | 11 | ||
12 | npm run concurrently -- -k -s first \ | 12 | npm run concurrently -- -k -s first \ |
13 | "cd client && npm run ng -- e2e --port 3333" \ | 13 | "cd client && npm run ng -- e2e --port 3333" \ |
14 | "NODE_ENV=test NODE_APP_INSTANCE=1 NODE_CONFIG='{ \"log\": { \"level\": \"warning\" }, \"signup\": { \"enabled\": false } }' node dist/server" | 14 | "NODE_ENV=test NODE_APP_INSTANCE=1 NODE_CONFIG='{ \"log\": { \"level\": \"warn\" }, \"signup\": { \"enabled\": false } }' node dist/server" |
diff --git a/scripts/e2e/local.sh b/scripts/e2e/local.sh index 0e74707d8..469f2eb5e 100755 --- a/scripts/e2e/local.sh +++ b/scripts/e2e/local.sh | |||
@@ -12,4 +12,4 @@ npm run clean:server:test | |||
12 | 12 | ||
13 | npm run concurrently -- -k -s first \ | 13 | npm run concurrently -- -k -s first \ |
14 | "cd client && npm run ng -- e2e --port 3333 -c local" \ | 14 | "cd client && npm run ng -- e2e --port 3333 -c local" \ |
15 | "NODE_ENV=test NODE_APP_INSTANCE=1 NODE_CONFIG='{ \"log\": { \"level\": \"warning\" }, \"signup\": { \"enabled\": false } }' node dist/server" | 15 | "NODE_ENV=test NODE_APP_INSTANCE=1 NODE_CONFIG='{ \"log\": { \"level\": \"warn\" }, \"signup\": { \"enabled\": false } }' node dist/server" |
diff --git a/scripts/optimize-old-videos.ts b/scripts/optimize-old-videos.ts index 01d30244f..9692d76ba 100644 --- a/scripts/optimize-old-videos.ts +++ b/scripts/optimize-old-videos.ts | |||
@@ -5,7 +5,7 @@ import { VIDEO_TRANSCODING_FPS } from '../server/initializers/constants' | |||
5 | import { getDurationFromVideoFile, getVideoFileBitrate, getVideoFileFPS, getVideoFileResolution } from '../server/helpers/ffprobe-utils' | 5 | import { getDurationFromVideoFile, getVideoFileBitrate, getVideoFileFPS, getVideoFileResolution } from '../server/helpers/ffprobe-utils' |
6 | import { getMaxBitrate } from '../shared/models/videos' | 6 | import { getMaxBitrate } from '../shared/models/videos' |
7 | import { VideoModel } from '../server/models/video/video' | 7 | import { VideoModel } from '../server/models/video/video' |
8 | import { optimizeOriginalVideofile } from '../server/lib/video-transcoding' | 8 | import { optimizeOriginalVideofile } from '../server/lib/transcoding/video-transcoding' |
9 | import { initDatabaseModels } from '../server/initializers/database' | 9 | import { initDatabaseModels } from '../server/initializers/database' |
10 | import { basename, dirname } from 'path' | 10 | import { basename, dirname } from 'path' |
11 | import { copy, move, remove } from 'fs-extra' | 11 | import { copy, move, remove } from 'fs-extra' |
diff --git a/scripts/print-transcode-command.ts b/scripts/print-transcode-command.ts index f6c96790e..00ac9ab6c 100644 --- a/scripts/print-transcode-command.ts +++ b/scripts/print-transcode-command.ts | |||
@@ -5,7 +5,7 @@ import * as program from 'commander' | |||
5 | import * as ffmpeg from 'fluent-ffmpeg' | 5 | import * as ffmpeg from 'fluent-ffmpeg' |
6 | import { buildx264VODCommand, runCommand, TranscodeOptions } from '@server/helpers/ffmpeg-utils' | 6 | import { buildx264VODCommand, runCommand, TranscodeOptions } from '@server/helpers/ffmpeg-utils' |
7 | import { exit } from 'process' | 7 | import { exit } from 'process' |
8 | import { VideoTranscodingProfilesManager } from '@server/lib/video-transcoding-profiles' | 8 | import { VideoTranscodingProfilesManager } from '@server/lib/transcoding/video-transcoding-profiles' |
9 | 9 | ||
10 | program | 10 | program |
11 | .arguments('<path>') | 11 | .arguments('<path>') |
diff --git a/scripts/prune-storage.ts b/scripts/prune-storage.ts index 32314b0b7..0f2d1320e 100755 --- a/scripts/prune-storage.ts +++ b/scripts/prune-storage.ts | |||
@@ -11,7 +11,7 @@ import { VideoRedundancyModel } from '../server/models/redundancy/video-redundan | |||
11 | import * as Bluebird from 'bluebird' | 11 | import * as Bluebird from 'bluebird' |
12 | import { getUUIDFromFilename } from '../server/helpers/utils' | 12 | import { getUUIDFromFilename } from '../server/helpers/utils' |
13 | import { ThumbnailModel } from '../server/models/video/thumbnail' | 13 | import { ThumbnailModel } from '../server/models/video/thumbnail' |
14 | import { ActorImageModel } from '../server/models/account/actor-image' | 14 | import { ActorImageModel } from '../server/models/actor/actor-image' |
15 | import { uniq, values } from 'lodash' | 15 | import { uniq, values } from 'lodash' |
16 | import { ThumbnailType } from '@shared/models' | 16 | import { ThumbnailType } from '@shared/models' |
17 | 17 | ||
diff --git a/scripts/reset-password.ts b/scripts/reset-password.ts index 7e7de6b8a..7c1a64a3f 100755 --- a/scripts/reset-password.ts +++ b/scripts/reset-password.ts | |||
@@ -3,7 +3,7 @@ registerTSPaths() | |||
3 | 3 | ||
4 | import * as program from 'commander' | 4 | import * as program from 'commander' |
5 | import { initDatabaseModels } from '../server/initializers/database' | 5 | import { initDatabaseModels } from '../server/initializers/database' |
6 | import { UserModel } from '../server/models/account/user' | 6 | import { UserModel } from '../server/models/user/user' |
7 | import { isUserPasswordValid } from '../server/helpers/custom-validators/users' | 7 | import { isUserPasswordValid } from '../server/helpers/custom-validators/users' |
8 | 8 | ||
9 | program | 9 | program |
diff --git a/scripts/update-host.ts b/scripts/update-host.ts index e497be4e2..592684225 100755 --- a/scripts/update-host.ts +++ b/scripts/update-host.ts | |||
@@ -2,9 +2,9 @@ import { registerTSPaths } from '../server/helpers/register-ts-paths' | |||
2 | registerTSPaths() | 2 | registerTSPaths() |
3 | 3 | ||
4 | import { WEBSERVER } from '../server/initializers/constants' | 4 | import { WEBSERVER } from '../server/initializers/constants' |
5 | import { ActorFollowModel } from '../server/models/activitypub/actor-follow' | 5 | import { ActorFollowModel } from '../server/models/actor/actor-follow' |
6 | import { VideoModel } from '../server/models/video/video' | 6 | import { VideoModel } from '../server/models/video/video' |
7 | import { ActorModel } from '../server/models/activitypub/actor' | 7 | import { ActorModel } from '../server/models/actor/actor' |
8 | import { | 8 | import { |
9 | getLocalAccountActivityPubUrl, | 9 | getLocalAccountActivityPubUrl, |
10 | getLocalVideoActivityPubUrl, | 10 | getLocalVideoActivityPubUrl, |