Browse Source

soundlist creation script uses find now

Paul Klumpp 11 years ago
parent
commit
583a6f539a
2 changed files with 16 additions and 7 deletions
  1. 15 6
      q2compile/make_package.sh
  2. 1 1
      q2srv/action/h_admin/make_sndlist.sh

+ 15 - 6
q2compile/make_package.sh

@@ -19,13 +19,22 @@ done
 
 # q2dir cleanup
 cd $q2dir
-rm q2proded
-rm gs_starter.sh
-rm gs*sh
-rm action/game*.so
-rm -rf plugins
+rm -vf q2proded 2> /dev/null
+rm -vf gs_starter.sh
+rm -vf gs*sh
+rm -vf action/game*.so
+rm -vrf plugins
 
+# editor backup cleanup
+cd $pkg_dir
+fuppa=$(find -type f -iname *~)
+for x in $fuppa; do
+	rm -v "$x"
+done
+
+# building package
 # tar
 cd $pkg_dir/../
-rm aq2-basesrv-pkg-$ver.tgz
+rm -vf aq2-basesrv-pkg-$ver.tgz
 tar --exclude-vcs -cvf - aq2-basesrv/ | gzip -9 - > aq2-basesrv-pkg-$ver.tgz
+cp -v aq2-basesrv-pkg-$ver.tgz aq2-basesrv-pkg-latest.tgz

+ 1 - 1
q2srv/action/h_admin/make_sndlist.sh

@@ -10,7 +10,7 @@ ACTIONDIR=$(pwd)
 SNDDIR=$ACTIONDIR/sound/user
 CFGDIR=$ACTIONDIR/config
 cd $SNDDIR
-ls -1 *wav > $CFGDIR/sndlist.ini.current
+find -type f -iname "*wav" | sed -e 's/\.\///' $CFGDIR/sndlist.ini.current
 cd $CFGDIR
 cp sndlist.ini.header sndlist.ini
 sort sndlist.ini.current >> sndlist.ini