Revert "Use separate base-public name for base-public.hnp"

This reverts commit c5e89bd.

Author: jiegec

README.md

@@ -61,16 +61,16 @@ Pro tip: you can use these utilities in the builtin Terminal app under `/data/se
 Although some paths might get wrong due to prefix set to `/data/app/base.org/base_1.0` (thanks to @duskmoon314). You can override them like:
 
 ```shell
-LD_LIBRARY_PATH=/data/service/hnp/base-public.org/base-public_1.0/lib TERMINFO=/data/service/hnp/base-public.org/base-public_1.0/share/terminfo fish
+LD_LIBRARY_PATH=/data/service/hnp/base.org/base_1.0/lib TERMINFO=/data/service/hnp/base.org/base_1.0/share/terminfo fish
 ```
 
 You can persist them to `~/.bashrc`, and run bash before executing other commands from Termony:
 
 ```shell
-if [ -d "/data/service/hnp/base-public.org/base-public_1.0" ]; then
-  export LD_LIBRARY_PATH=/data/service/hnp/base-public.org/base-public_1.0/lib
-  export TERMINFO=/data/service/hnp/base-public.org/base-public_1.0/share/terminfo
-  export VIM=/data/service/hnp/base-public.org/base-public_1.0/share/vim
+if [ -d "/data/service/hnp/base.org/base_1.0" ]; then
+  export LD_LIBRARY_PATH=/data/service/hnp/base.org/base_1.0/lib
+  export TERMINFO=/data/service/hnp/base.org/base_1.0/share/terminfo
+  export VIM=/data/service/hnp/base.org/base_1.0/share/vim
   export TMUX_TMPDIR=/data/storage/el2/base/cache
 fi
 ```

build-hnp/Makefile

@@ -42,7 +42,7 @@ all: copy
 copy: base.hnp
 	rm -f ../entry/hnp/arm64-v8a/*.hnp
 	cp $^ ../entry/hnp/arm64-v8a
-	cp base-public.hnp ../entry/hnp/arm64-v8a
+	cp $^ ../entry/hnp/arm64-v8a/base-public.hnp
 
 base.hnp: $(STAMP) utils/pbcopy utils/pbpaste
 	# reduce size
@@ -61,7 +61,6 @@ base.hnp: $(STAMP) utils/pbcopy utils/pbpaste
 	cp $(TOOL_HOME)/sdk/default/openharmony/native/llvm/lib/clang/15.0.4/lib/aarch64-linux-ohos/clang_rt.crtend.o sysroot/aarch64-unknown-linux-musl/lib/crtend.o
 	cp $(TOOL_HOME)/sdk/default/openharmony/native/llvm/lib/clang/15.0.4/lib/aarch64-linux-ohos/libclang_rt.builtins.a sysroot/aarch64-unknown-linux-musl/lib/libgcc.a
 	$(TOOL_HOME)/sdk/default/openharmony/toolchains/hnpcli pack -i sysroot -n base -v 1.0
-	$(TOOL_HOME)/sdk/default/openharmony/toolchains/hnpcli pack -i sysroot -n base-public -v 1.0
 
 %/.stamp: %/Makefile
 	make -C $(patsubst %/.stamp,%,$@)