Unified work (#269)

* Some work on line endings

* Enable buildkit

* Update documentation

* Settle the newline and tab vs spaces for now

Not perfect, but it's a standard

* Change wording

* Update version memo

* Add correct definition for markdown

* Make things clearer
This commit is contained in:
Michiel Hazelhof
2025-12-09 21:13:35 +01:00
committed by GitHub
parent f6d7470ce8
commit 389be8cea8
16 changed files with 676 additions and 638 deletions

19
.editorconfig Normal file
View File

@@ -0,0 +1,19 @@
root=true
###############################
# Core EditorConfig Options #
###############################
# All files
[*]
indent_style=tab
indent_size=4
trim_trailing_whitespace=true
end_of_line=lf
charset=utf-8
[*.{cs}]
insert_final_newline=false
[*.{md,mkdn}]
trim_trailing_whitespace = true
indent_style = space

2
.gitattributes vendored
View File

@@ -1 +1 @@
*.ps1 text eol=crlf
* text eol=lf

View File

@@ -1,12 +1,14 @@
# BitBetter
# BitBetter lite
BitBetter is is a tool to modify Bitwarden's core dll to allow you to generate your own individual and organisation licenses.
Please see the FAQ below for details on why this software was created.
_Beware! BitBetter does some semi janky stuff to rewrite the bitwarden core dll and allow the installation of a self signed certificate. Use at your own risk!_
Be aware that this branch is **only** for the lite (formerly unified) version of bitwarden. It has been rewritten and works in different ways than the master branch.
Credit to https://github.com/h44z/BitBetter and https://github.com/jakeswenson/BitBetter
_Beware! BitBetter is a solution that generates a personal certificate and uses that to generate custom licences. This requires (automated) modifying of libraries. Use at your own risk!_
Credit to https://github.com/h44z/BitBetter and https://github.com/jakeswenson/BitBetter and https://github.com/GieltjE/BitBetter
# Table of Contents
- [BitBetter](#bitbetter)
@@ -30,7 +32,7 @@ The following instructions are for unix-based systems (Linux, BSD, macOS) and Wi
## Dependencies
Aside from docker, which you also need for Bitwarden, BitBetter requires the following:
* Bitwarden (tested with 1.47.1, might work on lower versions)
* Bitwarden (tested with 2025.11.1 might work on lower versions), for safety always stay up to date
* openssl (probably already installed on most Linux or WSL systems, any version should work, on Windows it will be auto installed using winget)
## Setting up BitBetter
@@ -156,6 +158,15 @@ docker exec bitwarden ln -s /usr/share/zoneinfo/Europe/Amsterdam /etc/localtime
Require a recreation of the docker container, build.sh will suffice too.
## Migrating from the old unified branch
```
git branch -m unified lite
git fetch origin
git branch -u origin/lite lite
git remote set-head origin -a
```
# Footnotes
<a name="#f1"><sup>1</sup></a>This tool builds on top of the `bitbetter/api` container image so make sure you've built that above using the root `./build.sh` script.

View File

@@ -4,6 +4,10 @@ $PSNativeCommandUseErrorActionPreference = $true
# detect buildx, ErrorActionPreference will ensure the script stops execution if not found
docker buildx version
# Enable BuildKit for better build experience and to ensure platform args are populated
$env:DOCKER_BUILDKIT=1
$env:COMPOSE_DOCKER_CLI_BUILD=1
# define temporary directory
$tempdirectory = "$pwd\temp"
# define services to patch

View File

@@ -4,6 +4,10 @@ set -e
# detect buildx, set -e will ensure the script stops execution if not found
docker buildx version
# Enable BuildKit for better build experience and to ensure platform args are populated
export DOCKER_BUILDKIT=1
export COMPOSE_DOCKER_CLI_BUILD=1
# define temporary directory
TEMPDIRECTORY="$PWD/temp"