Changeset 23553

Timestamp:

2014/06/14 00:23:36 (10 years ago)

Author:

shutta

Message:

#1980 インストールシェルの2.12対応
追加SQL文実行処理部分を一時ファイルを生成せずに処理するよう改良。

File:

• branches/version-2_13-dev/eccube_install.sh (modified) (4 diffs)

branches/version-2_13-dev/eccube_install.sh

@@ -139 +139 @@
 }
 
+get_optional_sql()
+{
+    echo "INSERT INTO dtb_member (member_id, login_id, password, salt, work, del_flg, authority, creator_id, rank, update_date) VALUES (2, 'admin', '${ADMINPASS}', '${AUTH_MAGIC}', '1', '0', '0', '0', '1', current_timestamp);"
+    echo "INSERT INTO dtb_baseinfo (id, shop_name, email01, email02, email03, email04, top_tpl, product_tpl, detail_tpl, mypage_tpl, update_date) VALUES (1, '${SHOP_NAME}', '${ADMIN_MAIL}', '${ADMIN_MAIL}', '${ADMIN_MAIL}', '${ADMIN_MAIL}', 'default1', 'default1', 'default1', 'default1', current_timestamp);"
+}
+
 create_config_php()
 {
@@ -193 +199 @@
 #-- Setup Database
 SQL_DIR="./html/install/sql"
-OPTIONAL_SQL_FILE=optional.sql
-if [ -f ${OPTIONAL_SQL_FILE} ]
-then
-    echo "remove optional SQL"
-    rm ${OPTIONAL_SQL_FILE}
-fi
-
-echo "create optional SQL..."
-echo "INSERT INTO dtb_member (member_id, login_id, password, salt, work, del_flg, authority, creator_id, rank, update_date) VALUES (2, 'admin', '${ADMINPASS}', '${AUTH_MAGIC}', '1', '0', '0', '0', '1', current_timestamp);" >> ${OPTIONAL_SQL_FILE}
-echo "INSERT INTO dtb_baseinfo (id, shop_name, email01, email02, email03, email04, top_tpl, product_tpl, detail_tpl, mypage_tpl, update_date) VALUES (1, '${SHOP_NAME}', '${ADMIN_MAIL}', '${ADMIN_MAIL}', '${ADMIN_MAIL}', '${ADMIN_MAIL}', 'default1', 'default1', 'default1', 'default1', current_timestamp);" >> ${OPTIONAL_SQL_FILE}
 
 case "${DBTYPE}" in
@@ -218 +214 @@
     create_sequence_tables
     echo "execute optional SQL..."
-    sudo -u ${PGUSER} ${PSQL} -U ${DBUSER} -f ${OPTIONAL_SQL_FILE} ${DBNAME}
+    get_optional_sql | sudo -u ${PGUSER} ${PSQL} -U ${DBUSER} ${DBNAME}
 ;;
 "mysql" )
@@ -242 +238 @@
     create_sequence_tables
     echo "execute optional SQL..."
-    ${MYSQL} -u ${DBUSER} ${PASSOPT} ${DBNAME} < ${OPTIONAL_SQL_FILE}
+    get_optional_sql | ${MYSQL} -u ${DBUSER} ${PASSOPT} ${DBNAME}
 ;;
 esac