Просмотр исходного кода

#906 Fix Composer install when folder is missing (#907)

Jaap Marcus 5 лет назад
Родитель
Сommit
9c0cacc438
1 измененных файлов с 3 добавлено и 3 удалено
  1. 3 3
      bin/v-add-user-composer

+ 3 - 3
bin/v-add-user-composer

@@ -46,9 +46,9 @@ if [ -f "$COMPOSER_BIN" ]; then
     exit
 fi
 
-[ -z "$(readlink -f "$COMPOSER_DIR" | egrep "^$HOMEDIR/$user/")" ] && check_result $E_FORBIDEN "Path outside of user homedir (Composer dir)"
-[ -z "$(readlink -f "$COMPOSER_BIN" | egrep "^$HOMEDIR/$user/")" ] && check_result $E_FORBIDEN "Path outside of user homedir (Composer bin)"
-[ -z "$(readlink -f "$HOMEDIR/$user/.config/" | egrep "^$HOMEDIR/$user/")" ] && check_result $E_FORBIDEN "Path outside of user homedir (.conf)"
+[ -z "$(readlink -m "$COMPOSER_DIR" | egrep "^$HOMEDIR/$user/")" ] && check_result $E_FORBIDEN "Path outside of user homedir (Composer dir)"
+[ -z "$(readlink -m "$COMPOSER_BIN" | egrep "^$HOMEDIR/$user/")" ] && check_result $E_FORBIDEN "Path outside of user homedir (Composer bin)"
+[ -z "$(readlink -m "$HOMEDIR/$user/.config/" | egrep "^$HOMEDIR/$user/")" ] && check_result $E_FORBIDEN "Path outside of user homedir (.conf)"
 
 mkdir -p "$COMPOSER_DIR"
 chown $user: "$COMPOSER_DIR"