fixed linux installer

This commit is contained in:
filux
2016-01-10 00:57:57 +01:00
parent bf6f7874c0
commit bf1ef05531
3 changed files with 19 additions and 17 deletions

View File

@@ -85,8 +85,7 @@ cd "$RELEASEDIR"
mkdir -p "$RELEASEDIR/docs/" mkdir -p "$RELEASEDIR/docs/"
cd "$RELEASEDIR/docs/" cd "$RELEASEDIR/docs/"
git archive --remote ${REPODIR}/data/glest_game/ HEAD:docs | tar x git archive --remote ${REPODIR}/data/glest_game/ HEAD:docs | tar x
git archive --remote ${REPODIR} HEAD:docs/ CHANGELOG.txt | tar x git archive --remote ${REPODIR} HEAD:docs | tar x
git archive --remote ${REPODIR} HEAD:docs/ README.txt | tar x
cd "$RELEASEDIR" cd "$RELEASEDIR"
mkdir -p "$RELEASEDIR/maps/" mkdir -p "$RELEASEDIR/maps/"

View File

@@ -219,8 +219,9 @@ for feh in *.so *.dll *.dylib ; do
done done
# Compile the Lua scripts, put them in the base archive. # Compile the Lua scripts, put them in the base archive.
for feh in ../scripts/*.lua ; do for feh in ../mojosetup/scripts/*.lua ; do
./mojoluac $LUASTRIPOPT -o ../image/scripts/${feh}c $feh feh_b="$(basename $feh)"
./mojoluac $LUASTRIPOPT -o ../image/scripts/${feh_b}c $feh
done done
# Don't want the example config...use our's instead. # Don't want the example config...use our's instead.
@@ -234,20 +235,22 @@ rm -f ../image/scripts/app_localization.luac
# Fill in the rest of the Base Archive... # Fill in the rest of the Base Archive...
cd .. cd ..
# Compress the main data archive
cd data
#${megaglest_archiver_app_data} ${megaglest_archivefilename_data}
tar -cf - * | xz > ../$megaglest_archivefilename_data
# now remove everything except for the docs folder and the data archive
shopt -s extglob shopt -s extglob
rm -rf !(docs|$megaglest_archivefilename_data) if [ $REPACKONLY -eq 0 ]; then
# now remove everything in the docs except files listed in config.lua # Compress the main data archive
cd docs cd data
rm -rf !(gnu_gpl_*.txt|cc-by-sa-*-unported.txt|README.txt) #${megaglest_archiver_app_data} ${megaglest_archivefilename_data}
cd .. tar -cf - * | xz > ../$megaglest_archivefilename_data
# now remove everything except for the docs folder and the data archive
rm -rf !(docs|${megaglest_archivefilename_data})
# now remove everything in the docs except files listed in config.lua
cd docs
rm -rf !(gnu_gpl_*.txt|cc-by-sa-*-unported.txt|README.txt)
cd ..
cd .. cd ..
mv -f $megaglest_archivefilename_data data/ mv -f $megaglest_archivefilename_data data/
fi
cp -R data/* image/data/ cp -R data/* image/data/
cp meta/* image/meta/ cp meta/* image/meta/