diff options
| author | Hisham Muhammad <hisham@gobolinux.org> | 2011-09-04 17:10:38 -0700 |
|---|---|---|
| committer | Hisham Muhammad <hisham@gobolinux.org> | 2011-09-04 17:10:38 -0700 |
| commit | f80ac52448bd7c005f7bb2846e6aaf4ac84b0700 (patch) | |
| tree | 6c34b63ae4cc77d9ca04a068039e119d122f11f6 | |
| parent | df15eca97488e914b453fe6d50884e83c9af152d (diff) | |
| parent | ef3d1d3e38a8e7d84af68cfc7ff10fc0fad2e3ee (diff) | |
| download | luarocks-f80ac52448bd7c005f7bb2846e6aaf4ac84b0700.tar.gz luarocks-f80ac52448bd7c005f7bb2846e6aaf4ac84b0700.tar.bz2 luarocks-f80ac52448bd7c005f7bb2846e6aaf4ac84b0700.zip | |
Merge pull request #44 from ignacio/master
Removed misleading error messages on Windows installation script
| -rw-r--r-- | install.bat | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/install.bat b/install.bat index 4a1bf78a..df2a18d8 100644 --- a/install.bat +++ b/install.bat | |||
| @@ -269,7 +269,7 @@ IF ERRORLEVEL 1 GOTO ERROR | |||
| 269 | XCOPY /S src\luarocks\*.* "%LUADIR%\luarocks" >NUL | 269 | XCOPY /S src\luarocks\*.* "%LUADIR%\luarocks" >NUL |
| 270 | IF ERRORLEVEL 1 GOTO ERROR | 270 | IF ERRORLEVEL 1 GOTO ERROR |
| 271 | 271 | ||
| 272 | RENAME "%LUADIR%\luarocks\config.lua" config.lua.bak | 272 | IF EXIST "%LUADIR%\luarocks\config.lua" RENAME "%LUADIR%\luarocks\config.lua" config.lua.bak |
| 273 | ECHO module("luarocks.config")>> "%LUADIR%\luarocks\config.lua" | 273 | ECHO module("luarocks.config")>> "%LUADIR%\luarocks\config.lua" |
| 274 | ECHO LUA_INCDIR=[[%LUA_INCDIR%]]>> "%LUADIR%\luarocks\config.lua" | 274 | ECHO LUA_INCDIR=[[%LUA_INCDIR%]]>> "%LUADIR%\luarocks\config.lua" |
| 275 | ECHO LUA_LIBDIR=[[%LUA_LIBDIR%]]>> "%LUADIR%\luarocks\config.lua" | 275 | ECHO LUA_LIBDIR=[[%LUA_LIBDIR%]]>> "%LUADIR%\luarocks\config.lua" |
| @@ -287,9 +287,9 @@ ECHO LUAROCKS_PREFIX=[[%PREFIX%]]>> "%LUADIR%\luarocks\config.lua" | |||
| 287 | ECHO LUAROCKS_DOWNLOADER=[[curl]]>> "%LUADIR%\luarocks\config.lua" | 287 | ECHO LUAROCKS_DOWNLOADER=[[curl]]>> "%LUADIR%\luarocks\config.lua" |
| 288 | ECHO LUAROCKS_MD5CHECKER=[[md5sum]]>> "%LUADIR%\luarocks\config.lua" | 288 | ECHO LUAROCKS_MD5CHECKER=[[md5sum]]>> "%LUADIR%\luarocks\config.lua" |
| 289 | IF NOT [%FORCE_CONFIG%]==[] ECHO local LUAROCKS_FORCE_CONFIG=true>> "%LUADIR%\luarocks\config.lua" | 289 | IF NOT [%FORCE_CONFIG%]==[] ECHO local LUAROCKS_FORCE_CONFIG=true>> "%LUADIR%\luarocks\config.lua" |
| 290 | TYPE "%LUADIR%\luarocks\config.lua.bak">> "%LUADIR%\luarocks\config.lua" | 290 | IF EXIST "%LUADIR%\luarocks\config.lua.bak" TYPE "%LUADIR%\luarocks\config.lua.bak">> "%LUADIR%\luarocks\config.lua" |
| 291 | 291 | ||
| 292 | DEL /F /Q "%LUADIR%\luarocks\config.lua.bak" | 292 | IF EXIST "%LUADIR%\luarocks\config.lua.bak" DEL /F /Q "%LUADIR%\luarocks\config.lua.bak" |
| 293 | 293 | ||
| 294 | SET CONFIG_FILE=%SYSCONFDIR%\config.lua | 294 | SET CONFIG_FILE=%SYSCONFDIR%\config.lua |
| 295 | 295 | ||