Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,4 @@ docs/.sass-cache/
.remote-sync.json
.history
.vscode
*.bak
11 changes: 11 additions & 0 deletions core/class/zwavejs.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,17 @@ public static function configureSettings($_path) {
file_put_contents($file, json_encode($settings, JSON_FORCE_OBJECT));
}

public static function postConfig_wanted_zwavejs_version($_value = null) {
if($_value == null || trim($_value) == null){
if(file_exists(__DIR__.'/../../data/wanted_zwavejs_version')){
unlink(__DIR__.'/../../data/wanted_zwavejs_version');
}
} else{
$_value = preg_replace('/v*(\d+\.\d+\.\d+)/', "$1", $_value, 1);
file_put_contents(__DIR__.'/../../data/wanted_zwavejs_version', $_value);
}
}

public static function addFileEvent($_file, $_data) {
$status_path = dirname(__FILE__) . '/../../data/status';
if (!is_dir($status_path)) {
Expand Down
11 changes: 11 additions & 0 deletions plugin_info/configuration.php
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,17 @@
</div>
</div>
<div class="form-group zwavejs_mode local">
<label class="col-md-4 control-label">{{Version voulue (réservé aux utilisateurs avancés)}}
<sup><i class="fas fa-question-circle tooltips" title="{{Laisser vide pour installer la dernière version disponible <br/>Si vous voulez forcer une installation précise, cliquez sur le bouton &#x2192; Liste des versions <br/> Encodez la version voulue et pensez à sauvegarder avant de relancer les dépendances}}"></i></sup>
</label>
<div class="col-md-3">
<input class="configKey form-control" data-l1key="wanted_zwavejs_version" />
</div>
<div class="col-md-3">
<a class="btn btn-info" href="https://github.com/zwave-js/zwave-js-ui/tags" target="_blank">{{Liste des versions}}</a>
</div>
</div>
<div class="form-group">
<label class="col-md-4 control-label">{{Version ZwaveJS UI}}
<sup><i class="fas fa-question-circle tooltips" title="{{Version de la librairie ZwaveJS UI}}"></i></sup>
</label>
Expand Down
2 changes: 1 addition & 1 deletion resources/post_install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,4 @@ then
echo "And reboot your Raspberry Pi"
fi
fi
echo "Everything is successfully installed!"
echo "Everything is successfully installed!"
9 changes: 8 additions & 1 deletion resources/pre_install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,15 @@ BASEDIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )

cd $BASEDIR
source ../core/config/zwavejs.config.ini &> /dev/null

if [ -f "${BASEDIR}/../data/wanted_zwavejs_version" ]; then
wanted_zwavejs_version=$(cat "${BASEDIR}/../data/wanted_zwavejs_version")
if [ -n "${wanted_zwavejs_version}" ];then
wantedVersion=$wanted_zwavejs_version
fi
fi

echo "Wanted Version: $wantedVersion"
rm -R zwave-js-ui
git clone --branch v$wantedVersion --depth 1 https://github.com/zwave-js/zwave-js-ui
echo "Pre install finished"