Remove the prefix and postfix of chrome and ff

Author: perkfly

.github/workflows/build-and-test-make.yml

@@ -145,9 +145,9 @@ jobs:
 
       - name: Build the Chrome version of curl-impersonate
         run: |
-          make chrome-build
-          make chrome-checkbuild
-          make chrome-install
+          make build
+          make checkbuild
+          make install
 
       - name: Prepare the tests
         if: matrix.host == 'x86_64-linux-gnu'
@@ -202,7 +202,7 @@ jobs:
       - name: Clean build
         run: |
           set -e
-          make chrome-clean
+          make clean
           rm -Rf ${{ runner.temp }}/install
           mkdir ${{ runner.temp }}/install
 
@@ -220,21 +220,21 @@ jobs:
       - name: Rebuild statically
         run: |
           set -e
-          make chrome-build
-          make chrome-checkbuild
+          make build
+          make checkbuild
           if [[ "${{ endsWith(matrix.host, 'musl') }}" == "true" ]]; then
-            make chrome-install
+            make install
           else
-            make chrome-install-strip
+            make install-strip
           fi
 
       - name: Create tar release files for curl-impersonate
         run: |
           cd ${{ runner.temp }}/install/bin
           if [[ "${{ startsWith(github.ref, 'refs/tags/') }}" == "true" ]]; then
-            tar -c -z -f ${{ runner.temp }}/curl-impersonate-${{ github.ref_name }}.${{ matrix.host }}.tar.gz curl-impersonate-chrome curl_*
+            tar -c -z -f ${{ runner.temp }}/curl-impersonate-${{ github.ref_name }}.${{ matrix.host }}.tar.gz curl-impersonate curl_*
           else
-            tar -c -z -f ${{ runner.temp }}/curl-impersonate.${{ matrix.host }}.tar.gz curl-impersonate-chrome curl_*
+            tar -c -z -f ${{ runner.temp }}/curl-impersonate.${{ matrix.host }}.tar.gz curl-impersonate curl_*
           fi
           echo "release_file_bin=${{ runner.temp }}/curl-impersonate-${{ github.ref_name }}.${{ matrix.host }}.tar.gz" >> $GITHUB_ENV
 
@@ -337,9 +337,9 @@ jobs:
 
       - name: Build the Chrome version of curl-impersonate
         run: |
-          ${{ matrix.make }} chrome-build
-          ${{ matrix.make }} chrome-checkbuild
-          ${{ matrix.make }} chrome-install
+          ${{ matrix.make }} build
+          ${{ matrix.make }} checkbuild
+          ${{ matrix.make }} install
 
       - name: Prepare the tests
         run: |
@@ -366,7 +366,7 @@ jobs:
       - name: Clean build
         if: startsWith(github.ref, 'refs/tags/')
         run: |
-          ${{ matrix.make }} chrome-clean
+          ${{ matrix.make }} clean
           rm -Rf ${{ runner.temp }}/install
           mkdir ${{ runner.temp }}/install
 
@@ -379,15 +379,15 @@ jobs:
       - name: Rebuild statically
         if: startsWith(github.ref, 'refs/tags/')
         run: |
-          ${{ matrix.make }} chrome-build
-          ${{ matrix.make }} chrome-checkbuild
-          ${{ matrix.make }} chrome-install-strip
+          ${{ matrix.make }} build
+          ${{ matrix.make }} checkbuild
+          ${{ matrix.make }} install-strip
 
       - name: Create tar release files for curl-impersonate
         if: startsWith(github.ref, 'refs/tags/')
         run: |
           cd ${{ runner.temp }}/install/bin
-          tar -c -z -f ${{ runner.temp }}/curl-impersonate-${{ github.ref_name }}.${{ matrix.host }}.tar.gz curl-impersonate-chrome curl_*
+          tar -c -z -f ${{ runner.temp }}/curl-impersonate-${{ github.ref_name }}.${{ matrix.host }}.tar.gz curl-impersonate curl_*
           echo "release_file_bin=${{ runner.temp }}/curl-impersonate-${{ github.ref_name }}.${{ matrix.host }}.tar.gz" >> $GITHUB_ENV
 
       - name: Upload release files

INSTALL.md

@@ -35,8 +35,8 @@ Configure and compile:
 mkdir build && cd build
 ../configure
 # Build and install
-make chrome-build
-sudo make chrome-install
+make build
+sudo make install
 # You may need to update the linker's cache to find libcurl-impersonate
 sudo ldconfig
 # Optionally remove all the build files
@@ -54,7 +54,7 @@ curl_chrome119 https://www.wikipedia.org
 or run directly with you own flags:
 
 ```sh
-curl-impersonate-chrome https://www.wikipedia.org
+curl-impersonate https://www.wikipedia.org
 ```
 
 ### Red Hat based (CentOS/Fedora/Amazon Linux)
@@ -104,8 +104,8 @@ Configure and compile:
 mkdir build && cd build
 ../configure
 # Build and install
-gmake chrome-build
-sudo gmake chrome-install
+gmake build
+sudo gmake install
 # Optionally remove all the build files
 cd ../ && rm -Rf build
 ```
@@ -135,7 +135,7 @@ sudo apt-get install gcc-aarch64-linux-gnu g++-aarch64-linux-gnu
             --with-ca-path=/etc/ssl/certs \
             --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt
 
-make chrome-build
+make build
 ```
 
 The flags mean as follows:
@@ -149,13 +149,13 @@ The Docker build is a bit more reproducible and serves as the reference implemen
 [`chrome/Dockerfile`](chrome/Dockerfile) is a debian-based Dockerfile that will build curl with all the necessary modifications and patches. Build it like the following:
 
 ```sh
-docker build -t curl-impersonate-chrome chrome/
+docker build -t curl-impersonate chrome/
 ```
 
 The resulting binaries and libraries are in the `/usr/local` directory, which contains:
 
-* `curl-impersonate-chrome`, `curl-impersonate` - The curl binary that can impersonate Chrome/Edge/Safari. It is compiled statically against libcurl, BoringSSL, and libnghttp2 so that it won't conflict with any existing libraries on your system. You can use it from the container or copy it out. Tested to work on Ubuntu 20.04.
+* `curl-impersonate`, - The curl binary that can impersonate Chrome/Edge/Safari. It is compiled statically against libcurl, BoringSSL, and libnghttp2 so that it won't conflict with any existing libraries on your system. You can use it from the container or copy it out. Tested to work on Ubuntu 20.04.
 * `curl_chrome99`, `curl_chrome100`, `...` - Wrapper scripts that launch `curl-impersonate` with all the needed flags.
-* `libcurl-impersonate-chrome.so`, `libcurl-impersonate.so` - libcurl compiled with impersonation support. See [libcurl-impersonate](README.md#libcurl-impersonate) for more details.
+* `libcurl-impersonate.so`, `libcurl-impersonate.so` - libcurl compiled with impersonation support. See [libcurl-impersonate](README.md#libcurl-impersonate) for more details.
 
 You can use them inside the docker, copy them out using `docker cp` or use them in a multi-stage docker build.

Makefile.in

@@ -59,60 +59,60 @@ help: ## Show this help message
 .PHONY: help
 .DEFAULT_GOAL := help
 
-chrome-build: $(CURL_VERSION)/.chrome ## Build the Chrome version of curl-impersonate
+build: $(CURL_VERSION)/.chrome ## Build the Chrome version of curl-impersonate
 	cd $(CURL_VERSION)
 	# Don't pass this Makefile's MAKEFLAGS
 	$(MAKE) MAKEFLAGS=-j$(SUBJOBS)
-.PHONY: chrome-build
+.PHONY: build
 
-chrome-checkbuild: ## Run basic checks on the built binary
+checkbuild: ## Run basic checks on the built binary
 ifeq ($(host),$(build))
 	cd $(CURL_VERSION)
 	# Make sure all needed features were compiled in
-	./src/curl-impersonate-chrome -V | grep -q zlib
-	./src/curl-impersonate-chrome -V | grep -q brotli
-	./src/curl-impersonate-chrome -V | grep -q nghttp2
-	./src/curl-impersonate-chrome -V | grep -q BoringSSL
+	./src/curl-impersonate -V | grep -q zlib
+	./src/curl-impersonate -V | grep -q brotli
+	./src/curl-impersonate -V | grep -q nghttp2
+	./src/curl-impersonate -V | grep -q BoringSSL
 	$(info Build OK)
 else
 	$(info Cross compiling, skipping checkbuild)
 endif
-.PHONY: chrome-checkbuild
+.PHONY: checkbuild
 
-chrome-install: ## Install the Chrome version of curl-impersonate after build
+install: ## Install the Chrome version of curl-impersonate after build
 	cd $(CURL_VERSION)
 	$(MAKE) install-exec MAKEFLAGS=
 	# Wrapper scripts for the Chrome version (e.g. 'curl_chrome99')
 	install $(srcdir)/chrome/curl_* @bindir@
-.PHONY: chrome-install
+.PHONY: install
 
-chrome-install-strip: ## Like 'chrome-install', but strip binaries for smaller size
+install-strip: ## Like 'install', but strip binaries for smaller size
 	cd $(CURL_VERSION)
 	$(MAKE) install-exec MAKEFLAGS=
 	# We could have used 'install-strip' but then the docs would be installed as well.
 	# Instead strip manually.
-	$(STRIP) @bindir@/curl-impersonate-chrome
+	$(STRIP) @bindir@/curl-impersonate
 	# Wrapper scripts for the Chrome version (e.g. 'curl_chrome99')
 	install $(srcdir)/chrome/curl_chrome* $(srcdir)/chrome/curl_edge* $(srcdir)/chrome/curl_safari* @bindir@
-.PHONY: chrome-install-strip
+.PHONY: install-strip
 
-chrome-uninstall: ## Uninstall the Chrome version of curl-impersonate after 'make install'
+uninstall: ## Uninstall the Chrome version of curl-impersonate after 'make install'
 	cd $(CURL_VERSION)
 	$(MAKE) uninstall MAKEFLAGS=
 	rm -Rf @bindir@/curl_chrome* @bindir@/curl_edge* @bindir@/curl_safari*
-.PHONY: chrome-uninstall
+.PHONY: uninstall
 
-chrome-clean: ## Clean build artifacts of the Chrome version. Use after re-running './configure'
-	cd $(CURL_VERSION)
-	$(MAKE) clean MAKEFLAGS=
-	rm -f .chrome
-.PHONY: chrome-clean
-
-clean: ## Remove all build artifacts, including dependencies
+clean: 
+	## Remove all build artifacts, including dependencies
 	rm -Rf brotli-$(BROTLI_VERSION).tar.gz brotli-$(BROTLI_VERSION)
 	rm -Rf boringssl-$(BORING_SSL_COMMIT).zip boringssl-$(BORING_SSL_COMMIT)
 	rm -Rf $(NGHTTP2_VERSION).tar.bz2 $(NGHTTP2_VERSION)
 	rm -Rf $(CURL_VERSION).tar.gz $(CURL_VERSION)
+	## Clean build artifacts of the Chrome version. Use after re-running './configure'
+	cd $(CURL_VERSION)
+	rm -f .chrome
+.PHONY: clean
+
 
 brotli-$(BROTLI_VERSION).tar.gz:
 	curl -L "https://github.com/google/brotli/archive/refs/tags/v${BROTLI_VERSION}.tar.gz" \
@@ -231,18 +231,18 @@ $(CURL_VERSION).tar.gz:
 		-o "$(CURL_VERSION).tar.gz"
 
 # Apply the "Chorme version" patches and mark using a dummy file
-$(CURL_VERSION)/.patched-chrome: $(srcdir)/chrome/patches/curl-*.patch
+$(CURL_VERSION)/.patched: $(srcdir)/chrome/patches/curl-*.patch
 	rm -Rf $(CURL_VERSION)
 	tar -xf $(CURL_VERSION).tar.gz
 	mv curl-$(CURL_VERSION) $(CURL_VERSION)  # fix directory name
 	cd $(CURL_VERSION)
 	for p in $^; do patch -p1 < $$p; done
 	# Re-generate the configure script
 	autoreconf -fi
-	touch .patched-chrome
+	touch .patched
 
 # This is a small hack that flags that curl was patched and configured in the "chrome" version
-$(CURL_VERSION)/.chrome: $(chrome_libs)	$(CURL_VERSION).tar.gz $(CURL_VERSION)/.patched-chrome
+$(CURL_VERSION)/.chrome: $(chrome_libs)	$(CURL_VERSION).tar.gz $(CURL_VERSION)/.patched
 	cd $(CURL_VERSION)
 
 	# Set up the configure flags to curl.

README.md

@@ -151,7 +151,7 @@ Other files of interest:
 
 If you'd like to help, please check out the [open issues in the origional repo](https://github.com/lwthiker/curl-impersonate/issues) and [open issues here](https://github.com/lexiforest/curl-impersonate/issues). You can open a pull request with your changes. Note that some of the upstream issues have been fixed.
 
-This repository contains the build process for `curl-impersonate`. The actual patches to `curl` are maintained in a [separate repository](https://github.com/lexiforest/curl) forked from lwthiker's fork of the upstream curl. The changes are maintained in the [impersonate-firefox](https://github.com/lexiforest/curl/tree/impersonate-firefox) and [impersonate-chrome](https://github.com/lexiforest/curl/tree/impersonate-chrome) branches.
+This repository contains the build process for `curl-impersonate`. The actual patches to `curl` are maintained in a [separate repository](https://github.com/lexiforest/curl) forked from lwthiker's fork of the upstream curl. The changes are maintained in the [impersonate-chrome](https://github.com/lexiforest/curl/tree/impersonate-chrome) branch.
 
 You may also need the [forked and patched](https://github.com/lexiforest/boringssl) BoringSSL.