Skip to content

Commit

Permalink
v0.7.1.1 - Bug Fixes
Browse files Browse the repository at this point in the history
- Replaced boolval with (bool) type casting, Fixes TechnicPack#322 and Resolves TechnicPack#329
- Fix undefined index when GitHub API client errors
- Add rule to ignore laravel compiled classes
- Remove composer pre-upgrade-script for removing laravel compiled classes
  • Loading branch information
GenPage committed Mar 2, 2015
1 parent 512b0fe commit 5bafd63
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 8 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,5 @@ public/resources/*
!public/resources/default
public/vendor
app/database/*.sqlite
site/
site/
bootstrap/compiled.php
2 changes: 1 addition & 1 deletion app/controllers/BaseController.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ public function __construct()
define('SOLDER_STREAM', 'DEV');
}
if(!defined('SOLDER_VERSION')) {
define('SOLDER_VERSION', 'v0.7.1.0');
define('SOLDER_VERSION', 'v0.7.1.1');
}

UpdateUtils::init();
Expand Down
2 changes: 1 addition & 1 deletion app/controllers/ModpackController.php
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ public function postEdit($modpack_id)

$useS3 = Config::get('solder.use_s3') ? true : false;
$S3bucket = Config::get('solder.bucket');
$newSlug = boolval($oldSlug != $modpack->slug);
$newSlug = (bool) $oldSlug != $modpack->slug;

if ($useS3) {
$resourcePath = storage_path() . '/resources/' . $modpack->slug;
Expand Down
3 changes: 2 additions & 1 deletion app/controllers/SolderController.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,13 @@ public function getUpdate()
{
$rawChangeLog = UpdateUtils::getLatestChangeLog();
$changelog = array_key_exists('error', $rawChangeLog) ? $rawChangeLog : array_slice($rawChangeLog, 0, 10);
$latestCommit = array_key_exists('error', $rawChangeLog) ? $rawChangeLog : $rawChangeLog[0];

$rawLatestVersion = UpdateUtils::getLatestVersion();
$latestVersion = array_key_exists('error', $rawLatestVersion) ? $rawLatestVersion : $rawLatestVersion['name'];

$latestData = array('version' => $latestVersion,
'commit' => $changelog[0]);
'commit' => $latestCommit);

return View::make('solder.update')->with('changelog', $changelog)->with('currentVersion', SOLDER_VERSION)->with('latestData', $latestData);
}
Expand Down
2 changes: 1 addition & 1 deletion app/views/solder/update.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
</label><br>
<label>Latest Commit:
@if (array_key_exists('error', $changelog))
<span class="label label-danger">{{ $latestData['error'] }}</span>
<span class="label label-danger">{{ $latestData['commit']['error'] }}</span>
@else
<span class="label label-default">{{ $latestData['commit']['sha'] }}</span>
@endif
Expand Down
3 changes: 0 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,6 @@
]
},
"scripts": {
"pre-update-cmd": [
"php -r \"@unlink('bootstrap/compiled.php');\""
],
"post-install-cmd": [
"php -r \"shell_exec((strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') ? 'mkdir app\\config && copy app\\config-sample app\\config' : 'cp -r app/config-sample app/config');\"",
"php -r \"copy('app/database-sample/production.sqlite', 'app/database/production.sqlite');\"",
Expand Down

0 comments on commit 5bafd63

Please sign in to comment.