other/BitBetter
1
0
Fork 0
mirror of https://github.com/jakeswenson/BitBetter.git synced 2025-09-15 06:13:26 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'unified' into unified

Browse Source
This commit is contained in:
Michiel Hazelhof 2025-08-12 15:51:22 +02:00 committed by GitHub
commit 1871df136b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.ps1
View File

@ -38,7 +38,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

2
build.sh
View File

@ -39,7 +39,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

2
src/licenseGen/Dockerfile
View File

@ -12,4 +12,4 @@ FROM mcr.microsoft.com/dotnet/sdk:8.0
WORKDIR /app WORKDIR /app
COPY --from=build /app . COPY --from=build /app .
ENTRYPOINT ["dotnet", "/app/licenseGen.dll", "--cert=/app/cert.pfx", "--core=/app/Core.dll"] ENTRYPOINT ["dotnet", "/app/licenseGen.dll", "--cert=/app/cert.pfx", "--core=/app/Core.dll"]

4
src/licenseGen/Program.cs
View File

@ -27,7 +27,7 @@ internal class Program
{ {
Check(); Check();
Console.WriteLine("Interactive license mode..."); Console.WriteLine("Interactive license mode...");
while (licenseType == "") while (licenseType == "")
{ {
Console.WriteLine("What would you like to generate, a [u]ser license or an [o]rg license: "); Console.WriteLine("What would you like to generate, a [u]ser license or an [o]rg license: ");
@ -210,7 +210,7 @@ internal class Program
CommandArgument storage = config.Argument("Storage", "extra storage space in GB. Maximum is " + Int16.MaxValue + " (optional, default = max)"); CommandArgument storage = config.Argument("Storage", "extra storage space in GB. Maximum is " + Int16.MaxValue + " (optional, default = max)");
CommandArgument businessName = config.Argument("BusinessName", "name for the organization (optional)"); CommandArgument businessName = config.Argument("BusinessName", "name for the organization (optional)");
CommandArgument key = config.Argument("Key", "your key id (optional)"); CommandArgument key = config.Argument("Key", "your key id (optional)");
config.OnExecute(() => config.OnExecute(() =>
{ {
Check(); Check();