diff --git a/element-web.spec b/element-web.spec index 3a836b2..ab5eba1 100644 --- a/element-web.spec +++ b/element-web.spec @@ -44,12 +44,12 @@ echo 'yarn-offline-mirror "./npm-packages-offline-cache"' > .yarnrc ls -l ./npm-packages-offline-cache | head # fix some strange dependency -cp npm-packages-offline-cache/matrix-analytics-events-0.0.1.tgz \ - npm-packages-offline-cache/@matrix-analytics-events-0.0.1.tgz -ls -l ./npm-packages-offline-cache/*matrix-analytics-events* +#cp npm-packages-offline-cache/matrix-analytics-events-0.0.1.tgz \ +# npm-packages-offline-cache/@matrix-analytics-events-0.0.1.tgz +#ls -l ./npm-packages-offline-cache/*matrix-analytics-events* -sed -i -e 's| matrix-analytics-events "github:matrix-org/matrix-analytics-events.git#[^"]*"| matrix-analytics-events "^0.0.1"|' yarn.lock -sed -i -e 's|"matrix-analytics-events@github:matrix-org/matrix-analytics-events#[^"]*"|matrix-analytics-events@^0.0.1|' yarn.lock +#sed -i -e 's| matrix-analytics-events "github:matrix-org/matrix-analytics-events.git#[^"]*"| matrix-analytics-events "^0.0.1"|' yarn.lock +#sed -i -e 's|"matrix-analytics-events@github:matrix-org/matrix-analytics-events#[^"]*"|matrix-analytics-events@^0.0.1|' yarn.lock yarn install --offline --pure-lockfile diff --git a/npm-packages-offline-cache.tar.gz b/npm-packages-offline-cache.tar.gz index 0c07099..a36d0b0 100644 --- a/npm-packages-offline-cache.tar.gz +++ b/npm-packages-offline-cache.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ffd784a36e2f6b205f19077b74e43dd75802fc77328074c95c81a4940440be10 -size 97105985 +oid sha256:96c8a62b7990e7d956ab950af78f1ab74cf72887900418e6f5a74115510ce4db +size 97096106 diff --git a/prepare.sh b/prepare.sh index a06a3a8..a6be336 100644 --- a/prepare.sh +++ b/prepare.sh @@ -28,11 +28,11 @@ yarn install --pure-lockfile --ignore-engines || : # this will download tha pack # download some additional dependencie that slips through this earlier method cd ./npm-packages-offline-cache/ -wget -O matrix-analytics-events-0.0.1.tgz $(grep -m1 -A2 "@matrix.org/analytics-events" ../yarn.lock | grep resolved | awk '{print $NF}' | tr -d '"') -mkdir package -tar xvf matrix-analytics-events-0.0.1.tgz --strip-components=1 -C package/ -tar czf matrix-analytics-events-0.0.1.tgz package/ -rm -r package +#wget -O matrix-analytics-events-0.0.1.tgz $(grep -m1 -A2 "@matrix.org/analytics-events" ../yarn.lock | grep resolved | awk '{print $NF}' | tr -d '"') +#mkdir package +#tar xvf matrix-analytics-events-0.0.1.tgz --strip-components=1 -C package/ +#tar czf matrix-analytics-events-0.0.1.tgz package/ +#rm -r package # fill sentry-cli cache with mock binaries for all architecutres cd sentry-cli