other/BitBetter
1
0
Fork 0
mirror of https://github.com/jakeswenson/BitBetter.git synced 2025-10-31 04:43:25 +00:00
Code Issues Projects Releases Wiki Activity

[unified] Fix patch according to upstream changes and fix build errors (#243)

Browse Source 
* Fix bitbetter patch according to upstream changes

* Fix the builds by removing redundant already removed and stopped old instance

---------

Co-authored-by: juliokele <>
This commit is contained in:
juliokele 2025-07-29 19:48:55 +02:00 committed by GitHub
parent 076b0a624b
commit 01cdfa2842
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
build.ps1
View File

@ -39,7 +39,7 @@ Remove-Item "$pwd\src\bitBetter\cert.cert" -Force
# gather all running instances # gather all running instances
$oldinstances = docker container ps --all -f Name=bitwarden --format '{{.ID}}' $oldinstances = docker container ps --all -f Name=bitwarden --format '{{.ID}}'
# stop all running instances # stop and remove all running instances
foreach ($instance in $oldinstances) { foreach ($instance in $oldinstances) {
docker stop $instance docker stop $instance
docker rm $instance docker rm $instance
@ -58,10 +58,10 @@ else
} }
} }
# stop and remove previous existing patch(ed) container # remove previous existing patch(ed) image
docker stop bitwarden-patch if (docker image ls -q bitwarden-patch) {
docker rm bitwarden-patch docker image rm bitwarden-patch
docker image rm bitwarden-patch }
# start a new bitwarden instance so we can patch it # start a new bitwarden instance so we can patch it
$patchinstance = docker run -d --name bitwarden-patch ghcr.io/bitwarden/self-host:beta $patchinstance = docker run -d --name bitwarden-patch ghcr.io/bitwarden/self-host:beta

10
build.sh
View File

@ -40,7 +40,7 @@ rm -f "$PWD/src/bitBetter/cert.cert"
# gather all running instances # gather all running instances
OLDINSTANCES=$(docker container ps --all -f Name=bitwarden --format '{{.ID}}') OLDINSTANCES=$(docker container ps --all -f Name=bitwarden --format '{{.ID}}')
# stop all running instances # stop and remove all running instances
for INSTANCE in ${OLDINSTANCES[@]}; do for INSTANCE in ${OLDINSTANCES[@]}; do
docker stop $INSTANCE docker stop $INSTANCE
docker rm $INSTANCE docker rm $INSTANCE
@ -58,10 +58,10 @@ else
fi fi
fi fi
# stop and remove previous existing patch(ed) container # remove previous existing patch(ed) image
docker stop bitwarden-patch if [ "$(docker image ls -q bitwarden-patch)" ]; then
docker rm bitwarden-patch docker image rm bitwarden-patch
docker image rm bitwarden-patch fi
# start a new bitwarden instance so we can patch it # start a new bitwarden instance so we can patch it
PATCHINSTANCE=$(docker run -d --name bitwarden-patch ghcr.io/bitwarden/self-host:beta) PATCHINSTANCE=$(docker run -d --name bitwarden-patch ghcr.io/bitwarden/self-host:beta)

2
src/bitBetter/Program.cs
View File

@ -41,7 +41,7 @@ internal class Program
Console.WriteLine($"New Cert Thumbprint: {certificate.Thumbprint}"); Console.WriteLine($"New Cert Thumbprint: {certificate.Thumbprint}");
IEnumerable<TypeDef> services = moduleDefMd.Types.Where(t => t.Namespace == "Bit.Core.Services"); IEnumerable<TypeDef> services = moduleDefMd.Types.Where(t => t.Namespace == "Bit.Core.Billing.Services");
TypeDef type = services.First(t => t.Name == "LicensingService"); TypeDef type = services.First(t => t.Name == "LicensingService");
MethodDef constructor = type.FindConstructors().First(); MethodDef constructor = type.FindConstructors().First();