Compare commits

..

No commits in common. "main" and "v34" have entirely different histories.
main ... v34

6 changed files with 17 additions and 21 deletions

View File

@ -63,7 +63,6 @@
"typeinfo": "cpp", "typeinfo": "cpp",
"variant": "cpp", "variant": "cpp",
"format": "cpp", "format": "cpp",
"__nullptr": "cpp", "__nullptr": "cpp"
"codecvt": "cpp"
} }
} }

View File

@ -149,8 +149,6 @@ Usage:
bb64 -u Updates bb64 to the latest version (uses docker) bb64 -u Updates bb64 to the latest version (uses docker)
bb64 -v Prints the version number
)" << std::endl; )" << std::endl;
return -1; return -1;
} }
@ -161,11 +159,6 @@ Usage:
{ {
if (mode == "-u") if (mode == "-u")
return update_bb64(); return update_bb64();
else if (mode == "-v")
{
std::cout << VERSION << std::endl;
return 0;
}
else if (mode == "-e") else if (mode == "-e")
{ {
std::ostringstream oss; std::ostringstream oss;

View File

@ -8,7 +8,12 @@ mkdir -p "$OUTPUT_DIR"
# Build for x86_64 with musl static linking # Build for x86_64 with musl static linking
if [[ $(uname -m) == "x86_64" ]]; then if [[ $(uname -m) == "x86_64" ]]; then
echo "Building for x86_64 (musl static)..." echo "Building for x86_64 (musl static)..."
x86_64-linux-musl-g++ -O2 -static -o "$OUTPUT_DIR/bb64.amd64" bb64.cpp b64ed.cpp if command -v x86_64-linux-musl-g++ &>/dev/null; then
x86_64-linux-musl-g++ -O2 -static -o "$OUTPUT_DIR/bb64.amd64" bb64.cpp b64ed.cpp
else
g++ -O2 -static -o "$OUTPUT_DIR/bb64.amd64" bb64.cpp b64ed.cpp -static-libgcc -static-libstdc++
echo "Warning: musl-g++ not found, built with g++ static flags."
fi
echo "Built bb64.amd64 (x86_64, static)" echo "Built bb64.amd64 (x86_64, static)"
fi fi

View File

@ -24,7 +24,7 @@ fi
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
CHOWN_USER="$2" CHOWN_USER="$2"
if [[ -z "$CHOWN_USER" ]]; then if [[ -z "$CHOWN_USER" ]]; then
CHOWN_USER=$(id -u) CHOWN_USER=$USER
fi fi
# 1. Determine architecture # 1. Determine architecture
@ -61,9 +61,9 @@ rm "$TMPDIR/bb64"
# 6. Print success message # 6. Print success message
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
echo "bb64 installed successfully to $INSTALL_DIR/bb64 (arch $ARCH)" echo "bb64 installed successfully to $INSTALL_DIR/bb64 (arch $ARCH)"
# echo " " echo " "
# echo "Update bb64 with:" echo "Update bb64 with:"
# echo " bb64 -u" echo " bb64 -u"
# echo " " echo " "
# echo "try it out with:" echo "try it out with:"
# echo " bb64 ZWNobyAiSGVsbG8td29ybGQhIGJiNjQgaXMgd29ya2luZy4i" echo " bb64 ZWNobyAiSGVsbG8td29ybGQhIGJiNjQgaXMgd29ya2luZy4i"

View File

@ -17,9 +17,8 @@ if [ ! -f version.h ]; then
exit 1 exit 1
else else
v=$(cat version.h | grep -o 'static const char \*VERSION = "[0-9.]*";' | cut -d'"' -f2) v=$(cat version.h | grep -o 'static const char \*VERSION = "[0-9.]*";' | cut -d'"' -f2)
oldv=$v v=$((v+1))
v=$((v+1)) echo "Incrementing version from $v to $v" >&2
echo "Incrementing version from $oldv to $v" >&2
echo "static const char *VERSION = \"$v\";" > version.h echo "static const char *VERSION = \"$v\";" > version.h
fi fi
TAG="v$v" TAG="v$v"

View File

@ -1 +1 @@
static const char *VERSION = "39"; static const char *VERSION = "34";