From df00611edf38262dc085253907d4a9cff89e4bfa Mon Sep 17 00:00:00 2001
From: jiangcuo <jiangcuo@bingsin.com>
Date: Thu, 21 Nov 2024 18:12:18 +0800
Subject: [PATCH] Optimize the build process

---
 build.sh        |  4 +++-
 docker/start.sh | 23 +++++++----------------
 2 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/build.sh b/build.sh
index a8634c0..10b5a5e 100755
--- a/build.sh
+++ b/build.sh
@@ -52,17 +52,19 @@ dockerbuild(){
 	if [ -n "$BUILDERNAME"  ];then
 		docker run -it -e DEB_BUILD_OPTIONS=$DEB_OPT  -e PKGDIR=$SH_PATH/packages/$PKGNAME/$PKGNAME -v $SH_PATH/:$SH_PATH --name $PKGNAME --rm $BUILDERNAME || errlog "builderror"
 	else
-		docker run -it -e DEB_BUILD_OPTIONS=$DEB_OPT  -e PKGDIR=$SH_PATH/packages/$PKGNAME/$PKGNAME  -v $SH_PATH/:$SH_PATH --name $PKGNAME --rm pvebuilder || errlog "builderror"
+		docker run -it -e DEB_BUILD_OPTIONS=$DEB_OPT  -e PKGDIR=$SH_PATH/packages/$PKGNAME/$PKGNAME  -v $SH_PATH/:$SH_PATH --name $PKGNAME --rm pvebuilder|| errlog "builderror"
 	fi
 }
 
 upload_pkg(){
+	rm  $PKG_LOCATION_PATH/$PKGNAME -rf
 	mkdir $PKG_LOCATION_PATH/$PKGNAME -p
 	find "$SH_PATH/packages/$PKGNAME/$PKGNAME" -name "*.deb" -exec cp {} $PKG_LOCATION_PATH/$PKGNAME \;
 	find "$SH_PATH/packages/$PKGNAME/$PKGNAME" -name "*.buildinfo" -exec cp {} $PKG_LOCATION_PATH/$PKGNAME \;
 	find "$SH_PATH/packages/$PKGNAME/$PKGNAME" -name "*.changes" -exec cp {} $PKG_LOCATION_PATH/$PKGNAME \;
 	find "$SH_PATH/packages/$PKGNAME/$PKGNAME" -name "*.dsc" -exec cp {} $PKG_LOCATION_PATH/$PKGNAME \;
 	find "$SH_PATH/packages/$PKGNAME/$PKGNAME" -name "*.tar*" -exec cp {} $PKG_LOCATION_PATH/$PKGNAME \;
+	ls $PKG_LOCATION_PATH/$PKGNAME/
 	for i in `ls $PKG_LOCATION_PATH/$PKGNAME/*.deb`;
 		do
 		md5sum $i > $i.md5
diff --git a/docker/start.sh b/docker/start.sh
index 42cbac0..6ca4599 100644
--- a/docker/start.sh
+++ b/docker/start.sh
@@ -15,21 +15,21 @@ exec_build(){
 	echo "install depends"
 	apt update
         yes |mk-build-deps --install --remove
+	mkdir /tmp/$PKGDIR -p
         if [ -f "Makefile" ];then
 		echo "clean "
 		make clean || echo ok
 		echo "build deb in `pwd` "
 		if [ $dscflag == "dsc" ];then
 			make dsc || errlog "build  dsc error"
-			cp ../*.deb ../*.buildinfo ../*.changes ../*.dsc ../*.tar.* $PKGDIR
+			cp *.dsc *.tar.* /tmp/$PKGDIR
 		fi
-		cp ../*.deb ../*.buildinfo ../*.changes ../*.dsc ../*.tar.* $PKGDIR
                 make deb || errlog "build  deb error"
-		# We need copy deb files first beacuse of deb will be clean when dsc build 
-		cp ../*.deb ../*.buildinfo ../*.changes ../*.dsc ../*.tar.* $PKGDIR
+		# We need copy deb files first beacuse of deb will be clean when dsc build
+		cp -r /tmp/$PKGDIR/* ./
         else
 		dpkg-buildpackage -b -us -uc ||errlog "build deb error"
-                cp ../*.deb ../*.buildinfo ../*.changes ../*.dsc ../*.tar.* $PKGDIR
+                mv ../*.deb ../*.buildinfo ../*.changes ../*.dsc ../*.tar.* $PKGDIR
         fi
 }
 
@@ -42,16 +42,7 @@ if [ -f "$PKGDIR/../autobuild.sh" ];then
         cd $PKGDIR/../
         bash autobuild.sh
 else
-        # Rust not need copy
-        if [ ! -f "Cargo.toml" ];then
-                cd $PKGDIR
-                exec_build
-        else
-                mkdir /build/
-                rsync -ra $PKGDIR /build
-                cd /build/data
-                exec_build
-        fi
-
+        cd $PKGDIR
+        exec_build
 
 fi