Explorar el Código

fixes for map compressor

Daniel Gibbs hace 10 años
padre
commit
77e6999375

+ 4 - 4
lgsm/functions/compress_unreal2_maps.sh

@@ -19,7 +19,7 @@ echo ""
 echo "${compressedmapsdir}"
 echo "${compressedmapsdir}"
 echo ""
 echo ""
 while true; do
 while true; do
-	read -p "Start compression [y/N]" yn
+	read -e -i "y" -p "Start compression [Y/n]" yn
 	case $yn in
 	case $yn in
 	[Yy]* ) break;;
 	[Yy]* ) break;;
 	[Nn]* ) echo Exiting; return;;
 	[Nn]* ) echo Exiting; return;;
@@ -27,9 +27,9 @@ while true; do
 	esac
 	esac
 done
 done
 mkdir -pv "${compressedmapsdir}" > /dev/null 2>&1
 mkdir -pv "${compressedmapsdir}" > /dev/null 2>&1
-rm -rfv "${filesdir}/Maps/*.uz2"
+rm -rfv "${filesdir}/Maps/"*.uz2
 cd "${systemdir}"
 cd "${systemdir}"
 for map in "${filesdir}/Maps/*"; do
 for map in "${filesdir}/Maps/*"; do
-	./ucc-bin compress "../Maps/${map}" --nohomedir
+	./ucc-bin compress "${map}" --nohomedir
 done
 done
-mv -fv "${filesdir}/Maps/*.uz2" "${compressedmapsdir}"
+mv -fv "${filesdir}/Maps/"*.uz2 "${compressedmapsdir}"

+ 5 - 4
lgsm/functions/compress_ut99_maps.sh

@@ -19,7 +19,7 @@ echo ""
 echo "${compressedmapsdir}"
 echo "${compressedmapsdir}"
 echo ""
 echo ""
 while true; do
 while true; do
-	read -p "Start compression [y/N]" yn
+	read -e -i "y" -p "Start compression [Y/n]" yn
 	case $yn in
 	case $yn in
 	[Yy]* ) break;;
 	[Yy]* ) break;;
 	[Nn]* ) echo Exiting; return;;
 	[Nn]* ) echo Exiting; return;;
@@ -27,9 +27,10 @@ while true; do
 	esac
 	esac
 done
 done
 mkdir -pv "${compressedmapsdir}" > /dev/null 2>&1
 mkdir -pv "${compressedmapsdir}" > /dev/null 2>&1
-rm -rfv "${filesdir}/Maps/*.unr.uz"
+rm -rfv "${filesdir}/Maps/"*.unr.uz
 cd "${systemdir}"
 cd "${systemdir}"
 for map in "${filesdir}/Maps/*"; do
 for map in "${filesdir}/Maps/*"; do
-	./ucc-bin compress "../Maps/${map}" --nohomedir
+	./ucc-bin compress "${map}" --nohomedir
 done
 done
-mv -fv "${filesdir}/Maps/*.unr.uz" "${compressedmapsdir}"
+echo "mv -fv ${filesdir}/Maps/*.unr.uz ${compressedmapsdir}"
+mv -fv "${filesdir}/Maps/"*.unr.uz "${compressedmapsdir}"