ADD: Feature [0001344] Separate UseConfigInProgramDir from all other settings

This commit is contained in:
Alexander Koblov 2018-11-22 14:40:49 +00:00
commit 91d151a91c
9 changed files with 41 additions and 140 deletions

View file

@ -1,43 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<doublecmd DCVersion="0.0.0" ConfigVersion="5">
<Configuration Save="True">
<UseConfigInProgramDir>False</UseConfigInProgramDir>
</Configuration>
<Colors>
<FileFilters>
<Filter>
<Name>Pascal sources</Name>
<FileMasks>*.pas;*.pp</FileMasks>
<Color>32768</Color>
<Attributes/>
</Filter>
<Filter>
<Name>Pascal binaries</Name>
<FileMasks>*.ppu;*.o;*.dcu</FileMasks>
<Color>16711680</Color>
<Attributes/>
</Filter>
<Filter>
<Name>Specified Executables</Name>
<FileMasks>*</FileMasks>
<Color>55758</Color>
<Attributes>-rwxrwxr*x</Attributes>
</Filter>
<Filter>
<Name>Executables</Name>
<FileMasks>*</FileMasks>
<Color>32768</Color>
<Attributes>-*x*</Attributes>
</Filter>
</FileFilters>
</Colors>
<Plugins>
<WlxPlugins>
<WlxPlugin>
<Name>wlxMplayer</Name>
<Path>%commander_path%/plugins/wlx/wlxmplayer/wlxmplayer.wlx</Path>
<DetectString>(EXT="MPG")|(EXT="AVI")|(EXT="MPEG")|(EXT="FLV")</DetectString>
</WlxPlugin>
</WlxPlugins>
</Plugins>
</doublecmd>

View file

@ -71,7 +71,6 @@ mkdir -p $DC_INSTALL_DIR/plugins/dsx/dsxlocate
# Copy files
cp -a doublecmd $DC_INSTALL_DIR/
cp -a doublecmd.zdli $DC_INSTALL_DIR/
cp -a install/linux/doublecmd.xml $DC_INSTALL_DIR/
cp -a doublecmd.ext.example $DC_INSTALL_DIR/
cp -a pixmaps.txt $DC_INSTALL_DIR/
cp -a multiarc.ini $DC_INSTALL_DIR/
@ -138,6 +137,8 @@ if [ -z $CK_PORTABLE ]
install -d $DC_INSTALL_PREFIX/usr/share/polkit-1/actions
install -m 644 install/linux/org.doublecmd.root.policy $DC_INSTALL_PREFIX/usr/share/polkit-1/actions/
else
# Mark as portable version
touch $DC_INSTALL_DIR/doublecmd.inf
# Copy documentation
mkdir -p $DC_INSTALL_DIR/doc
cp -a doc/*.txt $DC_INSTALL_DIR/doc/