pub final uni17 & align pub scripts

markusicu · markusicu · commit ecd26be2e82b · 2025-08-16T10:33:28.000-07:00
diff --git a/pub/copy-alpha-to-draft.sh b/pub/copy-alpha-to-draft.sh
@@ -6,7 +6,7 @@
 # pub/copy-alpha-to-draft.sh  ~/unitools/mine/src  /tmp/unicode/Public/draft
 
 UNICODETOOLS=$1
-DRAFT=$2
+DEST=$2
 
 UNITOOLS_DATA=$UNICODETOOLS/unicodetools/data
 
@@ -17,9 +17,9 @@ EMOJI_VER=17.0
 
 TODAY=`date --iso-8601`
 
-mkdir -p $DRAFT
+mkdir -p $DEST
 
-cat > $DRAFT/sed-readmes.txt << eof
+cat > $DEST/sed-readmes.txt << eof
 s/COPY_YEAR/$COPY_YEAR/
 s/PUB_DATE/$TODAY/
 s/PUB_STATUS/draft/
@@ -29,35 +29,35 @@ s%PUBLIC_EMOJI%Public/draft/emoji%
 s%PUBLIC_UCD%Public/draft%
 eof
 
-mkdir -p $DRAFT/ucd
-cp -r $UNITOOLS_DATA/ucd/dev/* $DRAFT/ucd
-rm -r $DRAFT/ucd/Unihan
-mv $DRAFT/ucd/version-ReadMe.txt $DRAFT/ReadMe.txt
+mkdir -p $DEST/ucd
+cp -r $UNITOOLS_DATA/ucd/dev/* $DEST/ucd
+rm -r $DEST/ucd/Unihan
+mv $DEST/ucd/version-ReadMe.txt $DEST/ReadMe.txt
 
-mkdir -p $DRAFT/emoji
-cp $UNITOOLS_DATA/emoji/dev/* $DRAFT/emoji
+mkdir -p $DEST/emoji
+cp $UNITOOLS_DATA/emoji/dev/* $DEST/emoji
 
-mkdir -p $DRAFT/idna
-cp $UNITOOLS_DATA/idna/dev/* $DRAFT/idna
+mkdir -p $DEST/idna
+cp $UNITOOLS_DATA/idna/dev/* $DEST/idna
 
 # Fix permissions. Everyone can read, and search directories.
-chmod a+rX -R $DRAFT
+chmod a+rX -R $DEST
 
 # Update the readmes in-place (-i) as set up above.
-find $DRAFT -name '*ReadMe.txt' | xargs sed -i -f $DRAFT/sed-readmes.txt
+find $DEST -name '*ReadMe.txt' | xargs sed -i -f $DEST/sed-readmes.txt
 
 # Zip files for some types of data, after fixing permissions
-rm $DRAFT/ucd/UCD.zip
-(cd $DRAFT/ucd; zip -r UCD.zip *)
+rm $DEST/ucd/UCD.zip
+(cd $DEST/ucd; zip -r UCD.zip *)
 
 # Cleanup
-rm $DRAFT/sed-readmes.txt
+rm $DEST/sed-readmes.txt
 
-rm $DRAFT/alpha.zip
-(cd $DRAFT; zip -r alpha.zip *)
+rm $DEST/alpha.zip
+(cd $DEST; zip -r alpha.zip *)
 
 echo "--------------------"
 echo "Copy files from elsewhere:"
-echo "- Unihan.zip to $DRAFT/ucd"
-echo "- alpha charts to $DRAFT/charts"
+echo "- Unihan.zip to $DEST/ucd"
+echo "- alpha charts to $DEST/charts"
 
diff --git a/pub/copy-beta-to-draft.sh b/pub/copy-beta-to-draft.sh
@@ -6,7 +6,7 @@
 # pub/copy-beta-to-draft.sh  ~/unitools/mine/src  /tmp/unicode/Public/draft
 
 UNICODETOOLS=$1
-DRAFT=$2
+DEST=$2
 
 UNITOOLS_DATA=$UNICODETOOLS/unicodetools/data
 
@@ -17,9 +17,9 @@ EMOJI_VER=17.0
 
 TODAY=`date --iso-8601`
 
-mkdir -p $DRAFT
+mkdir -p $DEST
 
-cat > $DRAFT/sed-readmes.txt << eof
+cat > $DEST/sed-readmes.txt << eof
 s/COPY_YEAR/$COPY_YEAR/
 s/PUB_DATE/$TODAY/
 s/PUB_STATUS/draft/
@@ -29,55 +29,55 @@ s%PUBLIC_EMOJI%Public/draft/emoji%
 s%PUBLIC_UCD%Public/draft%
 eof
 
-mkdir -p $DRAFT/ucd
-cp -r $UNITOOLS_DATA/ucd/dev/* $DRAFT/ucd
-rm -r $DRAFT/ucd/Unihan
-mv $DRAFT/ucd/version-ReadMe.txt $DRAFT/ReadMe.txt
+mkdir -p $DEST/ucd
+cp -r $UNITOOLS_DATA/ucd/dev/* $DEST/ucd
+rm -r $DEST/ucd/Unihan
+mv $DEST/ucd/version-ReadMe.txt $DEST/ReadMe.txt
 
-mkdir -p $DRAFT/uca
-cp -r $UNITOOLS_DATA/uca/dev/* $DRAFT/uca
+mkdir -p $DEST/uca
+cp -r $UNITOOLS_DATA/uca/dev/* $DEST/uca
 
-mkdir -p $DRAFT/emoji
-cp $UNITOOLS_DATA/emoji/dev/* $DRAFT/emoji
+mkdir -p $DEST/emoji
+cp $UNITOOLS_DATA/emoji/dev/* $DEST/emoji
 
-mkdir -p $DRAFT/idna
-cp $UNITOOLS_DATA/idna/dev/* $DRAFT/idna
+mkdir -p $DEST/idna
+cp $UNITOOLS_DATA/idna/dev/* $DEST/idna
 
-mkdir -p $DRAFT/security
-cp $UNITOOLS_DATA/security/dev/* $DRAFT/security
+mkdir -p $DEST/security
+cp $UNITOOLS_DATA/security/dev/* $DEST/security
 
-mkdir -p $DRAFT/links
-cp $UNITOOLS_DATA/links/dev/* $DRAFT/links
+mkdir -p $DEST/links
+cp $UNITOOLS_DATA/links/dev/* $DEST/links
 
 # Fix permissions. Everyone can read, and search directories.
-chmod a+rX -R $DRAFT
+chmod a+rX -R $DEST
 
 # Update the readmes in-place (-i) as set up above.
-find $DRAFT -name '*ReadMe.txt' | xargs sed -i -f $DRAFT/sed-readmes.txt
+find $DEST -name '*ReadMe.txt' | xargs sed -i -f $DEST/sed-readmes.txt
 
 # Zip files for some types of data, after fixing permissions
-rm $DRAFT/ucd/UCD.zip
-(cd $DRAFT/ucd; zip -r UCD.zip *)
+rm $DEST/ucd/UCD.zip
+(cd $DEST/ucd; zip -r UCD.zip *)
 
-rm $DRAFT/uca/CollationTest.zip
-(cd $DRAFT/uca; zip -r CollationTest.zip CollationTest && rm -r CollationTest)
+rm $DEST/uca/CollationTest.zip
+(cd $DEST/uca; zip -r CollationTest.zip CollationTest && rm -r CollationTest)
 
-rm $DRAFT/security/*.zip
-(cd $DRAFT/security; zip -r uts39-data-$UNI_VER.zip *)
+rm $DEST/security/*.zip
+(cd $DEST/security; zip -r uts39-data-$UNI_VER.zip *)
 
 # Fix permissions again to catch the zip files
-chmod a+rX -R $DRAFT
+chmod a+rX -R $DEST
 
 # Cleanup
-rm $DRAFT/sed-readmes.txt
+rm $DEST/sed-readmes.txt
 
 # Zip file to deliver the whole set of data files
-rm $DRAFT/beta.zip
-(cd $DRAFT; zip -r beta.zip *)
+rm $DEST/beta.zip
+(cd $DEST; zip -r beta.zip *)
 
 echo "--------------------"
 echo "Copy files from elsewhere:"
-echo "- Unihan.zip to $DRAFT/ucd"
-echo "- UCDXML files to $DRAFT/ucdxml"
-echo "- beta charts to $DRAFT/charts"
+echo "- Unihan.zip to $DEST/ucd"
+echo "- UCDXML files to $DEST/ucdxml"
+echo "- beta charts to $DEST/charts"
 
diff --git a/pub/copy-final.sh b/pub/copy-final.sh
@@ -11,7 +11,7 @@ DEST=$2
 UNITOOLS_DATA=$UNICODETOOLS/unicodetools/data
 
 # Adjust the following for each year and version as needed.
-COPY_YEAR=2024
+COPY_YEAR=2025
 UNI_VER=17.0.0
 EMOJI_VER=17.0
 
@@ -25,34 +25,26 @@ s/PUB_DATE/$TODAY/
 s/PUB_STATUS/final/
 s/UNI_VER/$UNI_VER/
 s/EMOJI_VER/$EMOJI_VER/
-
-s%PUBLIC_EMOJI%Public/emoji/$EMOJI_VER%
+s%PUBLIC_EMOJI%Public/$UNI_VER/emoji%
 s%PUBLIC_UCD%Public/$UNI_VER%
 eof
 
-mkdir -p $DEST/$UNI_VER/ucd
-mkdir -p $DEST/zipped/$UNI_VER
-cp -r $UNITOOLS_DATA/ucd/dev/* $DEST/$UNI_VER/ucd
-rm -r $DEST/$UNI_VER/ucd/Unihan
-mv $DEST/$UNI_VER/ucd/version-ReadMe.txt $DEST/$UNI_VER/ReadMe.txt
-mv $DEST/$UNI_VER/ucd/zipped-ReadMe.txt $DEST/zipped/$UNI_VER/ReadMe.txt
-
-mkdir -p $DEST/UCA/$UNI_VER
-cp -r $UNITOOLS_DATA/uca/dev/* $DEST/UCA/$UNI_VER
+mkdir -p $DEST/ucd
+cp -r $UNITOOLS_DATA/ucd/dev/* $DEST/ucd
+rm -r $DEST/ucd/Unihan
+mv $DEST/ucd/version-ReadMe.txt $DEST/ReadMe.txt
 
-mkdir -p $DEST/emoji/$EMOJI_VER
-cp $UNITOOLS_DATA/emoji/dev/* $DEST/emoji/$EMOJI_VER
+mkdir -p $DEST/uca
+cp -r $UNITOOLS_DATA/uca/dev/* $DEST/uca
 
-mkdir -p $DEST/idna/$UNI_VER
-cp $UNITOOLS_DATA/idna/dev/* $DEST/idna/$UNI_VER
+mkdir -p $DEST/emoji
+cp $UNITOOLS_DATA/emoji/dev/* $DEST/emoji
 
-mkdir -p $DEST/idna/idna2008derived
-rm $DEST/idna/idna2008derived/*
-cp $UNITOOLS_DATA/idna/idna2008derived/Idna2008-$UNI_VER.txt $DEST/idna/idna2008derived
-cp $UNITOOLS_DATA/idna/idna2008derived/ReadMe.txt $DEST/idna/idna2008derived
+mkdir -p $DEST/idna
+cp $UNITOOLS_DATA/idna/dev/* $DEST/idna
 
-mkdir -p $DEST/security/$UNI_VER
-cp $UNITOOLS_DATA/security/dev/* $DEST/security/$UNI_VER
+mkdir -p $DEST/security
+cp $UNITOOLS_DATA/security/dev/* $DEST/security
 
 # Fix permissions. Everyone can read, and search directories.
 chmod a+rX -R $DEST
@@ -61,14 +53,14 @@ chmod a+rX -R $DEST
 find $DEST -name '*ReadMe.txt' | xargs sed -i -f $DEST/sed-readmes.txt
 
 # Zip files for some types of data, after fixing permissions
-rm $DEST/$UNI_VER/ucd/UCD.zip
-(cd $DEST/$UNI_VER/ucd; zip -r UCD.zip * && mv UCD.zip $DEST/zipped/$UNI_VER)
+rm $DEST/ucd/UCD.zip
+(cd $DEST/ucd; zip -r UCD.zip *)
 
-rm $DEST/uca/$UNI_VER/CollationTest.zip
-(cd $DEST/uca/$UNI_VER; zip -r CollationTest.zip CollationTest && rm -r CollationTest)
+rm $DEST/uca/CollationTest.zip
+(cd $DEST/uca; zip -r CollationTest.zip CollationTest && rm -r CollationTest)
 
-rm $DEST/security/$UNI_VER/*.zip
-(cd $DEST/security/$UNI_VER; zip -r uts39-data-$UNI_VER.zip *)
+rm $DEST/security/*.zip
+(cd $DEST/security; zip -r uts39-data-$UNI_VER.zip *)
 
 # Fix permissions again to catch the zip files
 chmod a+rX -R $DEST
@@ -82,8 +74,7 @@ rm $DEST/final.zip
 
 echo "--------------------"
 echo "Copy files from elsewhere:"
-echo "- Unihan.zip to $DEST/$UNI_VER/ucd"
-echo "- Unihan.zip to $DEST/zipped/$UNI_VER"
-echo "- UCDXML files to $DEST/$UNI_VER/ucdxml"
-echo "- final charts to $DEST/$UNI_VER/charts"
+echo "- Unihan.zip to $DEST/ucd"
+echo "- UCDXML files to $DEST/ucdxml"
+echo "- final charts to $DEST/charts"
 
diff --git a/pub/copy-ucd-to-draft.sh b/pub/copy-ucd-to-draft.sh
@@ -6,7 +6,7 @@
 # pub/copy-ucd-to-draft.sh  ~/unitools/mine/src  /tmp/unicode/Public/draft
 
 UNICODETOOLS=$1
-DRAFT=$2
+DEST=$2
 
 UNITOOLS_DATA=$UNICODETOOLS/unicodetools/data
 
@@ -17,9 +17,9 @@ EMOJI_VER=17.0
 
 TODAY=`date --iso-8601`
 
-mkdir -p $DRAFT
+mkdir -p $DEST
 
-cat > $DRAFT/sed-readmes.txt << eof
+cat > $DEST/sed-readmes.txt << eof
 s/COPY_YEAR/$COPY_YEAR/
 s/PUB_DATE/$TODAY/
 s/PUB_STATUS/draft/
@@ -29,29 +29,29 @@ s%PUBLIC_EMOJI%Public/draft/emoji%
 s%PUBLIC_UCD%Public/draft%
 eof
 
-mkdir -p $DRAFT/ucd
-cp -r $UNITOOLS_DATA/ucd/dev/* $DRAFT/ucd
-rm -r $DRAFT/ucd/Unihan
-rm -r $DRAFT/ucd/emoji
-mv $DRAFT/ucd/version-ReadMe.txt $DRAFT/ReadMe.txt
+mkdir -p $DEST/ucd
+cp -r $UNITOOLS_DATA/ucd/dev/* $DEST/ucd
+rm -r $DEST/ucd/Unihan
+rm -r $DEST/ucd/emoji
+mv $DEST/ucd/version-ReadMe.txt $DEST/ReadMe.txt
 
 # Fix permissions. Everyone can read, and search directories.
-chmod a+rX -R $DRAFT
+chmod a+rX -R $DEST
 
 # Update the readmes in-place (-i) as set up above.
-find $DRAFT -name '*ReadMe.txt' | xargs sed -i -f $DRAFT/sed-readmes.txt
+find $DEST -name '*ReadMe.txt' | xargs sed -i -f $DEST/sed-readmes.txt
 
 # Zip files for some types of data, after fixing permissions
-rm $DRAFT/ucd/UCD.zip
-(cd $DRAFT/ucd; zip -r UCD.zip *)
+rm $DEST/ucd/UCD.zip
+(cd $DEST/ucd; zip -r UCD.zip *)
 
 # Cleanup
-rm $DRAFT/sed-readmes.txt
+rm $DEST/sed-readmes.txt
 
-rm $DRAFT/ucd-snapshot.zip
-(cd $DRAFT; zip -r ucd-snapshot.zip *)
+rm $DEST/ucd-snapshot.zip
+(cd $DEST; zip -r ucd-snapshot.zip *)
 
 echo "--------------------"
 echo "Copy files from elsewhere:"
-echo "- Unihan.zip to $DRAFT/ucd"
+echo "- Unihan.zip to $DEST/ucd"
 
