Skip to content

Commit 622a027

Browse files
Update to follow the 4.8.x code refactoring
1 parent 7dded10 commit 622a027

File tree

1 file changed

+18
-8
lines changed

1 file changed

+18
-8
lines changed

compile.sh

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,12 @@ LANGUAGES_DIR="adminer/adminer/lang"
88
TRANSLATIONS_FILE="warning-translations.csv"
99
CSS_FILE="adminer/adminer/static/default.css"
1010
DESIGNS_DIR="adminer/designs"
11-
COMPILE_CMD="php adminer/compile.php sqlite "
11+
# COMPILE_CMD="../php-80/php adminer/compile.php sqlite"
12+
COMPILE_CMD="../php-74/php adminer/compile.php sqlite"
13+
# COMMIT_VERSION="190146672f6ce9b8f08af2d7e7a5e8f768d32ee6" # 4.7.8
14+
# 4.8.1-dev SQLite: Fix displayed types (bug #784, regression from 4.8.0)
15+
# https://github.com/vrana/adminer/commit/7f8c93a6f1e564ee4a9eb81cc89a3a9a6581a667
16+
COMMIT_VERSION="7f8c93a6f1e564ee4a9eb81cc89a3a9a6581a667" # 4.8.1-dev
1217

1318
step=1
1419
if [ ! -d "adminer" ]
@@ -18,24 +23,29 @@ echo -e "\n$step. Load adminer's sources:\n"
1823

1924
git clone --recurse-submodules https://github.com/vrana/adminer.git
2025

21-
# version 4.7.9-dev => 4.7.8
22-
# cd adminer
23-
# git reset --hard 190146672f6ce9b8f08af2d7e7a5e8f768d32ee6
24-
# cd ..
26+
cd adminer
27+
git reset --hard $COMMIT_VERSION
28+
cd ..
2529

2630
echo -e "\n$step. Load plugin code:\n"
2731
((step+=1))
28-
wget -P adminer/plugins/ https://raw.githubusercontent.com/FrancoisCapon/LoginToASqlite3DatabaseWithoutCredentialsWithAdminer/master/fc-sqlite-connection-without-credentials.php
32+
# wget -P adminer/plugins/ https://raw.githubusercontent.com/FrancoisCapon/LoginToASqlite3DatabaseWithoutCredentialsWithAdminer/master/fc-sqlite-connection-without-credentials.php
33+
curl -o adminer/plugins/fc-sqlite-connection-without-credentials.php https://raw.githubusercontent.com/FrancoisCapon/LoginToASqlite3DatabaseWithoutCredentialsWithAdminer/master/fc-sqlite-connection-without-credentials.php
2934
echo -e "\n$step. Adding the plugin to the sources\n"
3035
((step+=1))
31-
cat << "EOPHP" >> adminer/adminer/include/bootstrap.inc.php
36+
cp adminer/adminer/include/bootstrap.inc.php adminer/adminer/include/vrana-bootstrap.inc.php
37+
cat << "EOPHP" >> adminer/adminer/include/fc-bootstrap.inc.php
38+
<?php
39+
$_GET['sqlite']=''; // needed for 4.8.1
3240
include "../plugins/plugin.php";
3341
include "../plugins/fc-sqlite-connection-without-credentials.php";
3442
function adminer_object() {
3543
$plugins = array(new FCSqliteConnectionWithoutCredentials());
3644
return new AdminerPlugin($plugins);
37-
}
45+
}
3846
EOPHP
47+
cat adminer/adminer/include/fc-bootstrap.inc.php adminer/adminer/include/vrana-bootstrap.inc.php > adminer/adminer/include/bootstrap.inc.php
48+
sed -i '2,$s/<?php$//' adminer/adminer/include/bootstrap.inc.php
3949
fi
4050

4151
echo -e "\n$step. Search warning translation\n"

0 commit comments

Comments
 (0)